PERFORCE change 92299 for review

[Todd Miller]

http://perforce.freebsd.org/chv.cgi?CH=92299

Change 92299 by millert at millert_g4tower on 2006/02/23 20:11:32

	Update to reflect newrole name change.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/Makefile#4 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.1#2 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/Makefile#4 (text+ko) ====

@@ -1,9 +1,9 @@
 include ../../../Makeconfig
 
-PROG= sebsd_newrole
-MAN1= sebsd_newrole.1
+PROG= newrole
+MAN1= newrole.1
 
-OBJS= sebsd_newrole.o
+OBJS= newrole.o
 
 CFLAGS+= $(DARWIN_HDRS)
 CFLAGS+= -I$(SOURCE_ROOT)/sedarwin

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.1#2 (text+ko) ====

@@ -30,18 +30,18 @@
 .\"
 .\" $FreeBSD: $
 .Dd August 27, 2003
-.Dt SEBSD_NEWROLE 1
+.Dt NEWROLE 1
 .Os
 .Sh NAME
-.Nm sebsd_newrole
+.Nm newrole
 .Nd run a shell with a new role
 .Sh SYNOPSIS
-.Nm sebsd_newrole
+.Nm newrole
 .Ar ...
 .Sh DESCRIPTION
 The
-.Nm sebsd_newrole
+.Nm newrole
 utility runs a new shell in a new security context.
 The new context is derived from the old context in which 
-.Ar sebsd_newrole
+.Ar newrole
 is originally executed.

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/newrole/newrole.c#2 (text+ko) ====

@@ -29,7 +29,7 @@
 #include <sedarwin/sebsd.h>
 #include <sedarwin/flask_types.h>
 
-#define SEBSD_SERVICE_NAME "sebsd_newrole"
+#define SERVICE_NAME "newrole"
 
 extern char **environ;
 
@@ -68,7 +68,7 @@
 	  NULL
 	};
 
-	error = pam_start(SEBSD_SERVICE_NAME, pw->pw_name, &pam_conversation, 
+	error = pam_start(SERVICE_NAME, pw->pw_name, &pam_conversation, 
 	    &pam_handle);
 	if (error != PAM_SUCCESS) {
 		fprintf(stderr, "Error, failed to initialize PAM\n");
@@ -102,8 +102,8 @@
 	mac_t execlabel;
 
 	if (!sebsd_enabled()) {
-		fprintf(stderr, "Sorry, sebsd_newrole may only be used when "
-		    "the SEBSD security module is loaded\n");
+		fprintf(stderr, "Sorry, newrole may only be used when "
+		    "the SEDarwin security module is loaded\n");
 		exit(1);
 	}
 
@@ -231,6 +231,6 @@
 usage(void)
 {
 
-	fprintf(stderr, "usage: sebsd_newrole -r role [ -t type ] [ args ]\n");
+	fprintf(stderr, "usage: newrole -r role [ -t type ] [ args ]\n");
 	exit(1);
 }