From fa8ab4f366bb08e70999e97a54febf4fa3001e7e Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Tue, 16 Apr 1996 18:17:39 +0000 Subject: [PATCH] Drop support for option names in argv[0] git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7817 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/bsd/ChangeLog | 4 ++++ src/appl/bsd/krlogind.M | 8 ++------ src/appl/bsd/krlogind.c | 30 ------------------------------ src/appl/bsd/krshd.M | 6 +----- src/appl/bsd/krshd.c | 25 ------------------------- 5 files changed, 7 insertions(+), 66 deletions(-) diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 2a94ea0f2..d4be75527 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,7 @@ +Tue Apr 16 11:33:33 1996 Sam Hartman + + * krlogind.c kshd.c (main): Drop support for handling options in rlogind's name. + Sun Apr 14 03:41:49 1996 Sam Hartman * krlogind.c (fatalperror): Only declar sys_errlist if needed. diff --git a/src/appl/bsd/krlogind.M b/src/appl/bsd/krlogind.M index 1be713629..295617efb 100644 --- a/src/appl/bsd/krlogind.M +++ b/src/appl/bsd/krlogind.M @@ -61,7 +61,8 @@ mechanisms. This is the same as including \fB\-4\fP and \fB\-5\fP. .IP \fB\-r\fP Trust the remote hostname as an authentication system using the - \fI.rhosts\fP authorization list. + \fI.rhosts\fP authorization list. This option may +be desupported in future version of klogind. .IP \fB\-p\fP If all other authorization checks fail, prompt the user @@ -87,11 +88,6 @@ security, only Kerberos5 should be trusted; Kerberos4 and rhosts authentication do not include this checksum. If this options is specified, older Kerberos5 clients that do not send a checksum in the authenticator will not be able to authenticate to this server. -.PP -If no command-line -arguments are present, then the presence of the letters kr54cpPe in -the program-name before "logind" determine the behaviour of the -program exactly as with the command-line arguments. .PP If the diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c index 0615151eb..f57aaa0c4 100644 --- a/src/appl/bsd/krlogind.c +++ b/src/appl/bsd/krlogind.c @@ -341,36 +341,6 @@ pty_init(); openlog(progname, LOG_PID | LOG_NDELAY, LOG_AUTH); #endif /* 4.2 syslog */ - if (argc == 1) { /* Get parameters from program name. */ - if (strlen(progname) > MAX_PROG_NAME) { - usage(); - exit(1); - } - options = (char *) malloc(MAX_PROG_NAME+1); - options[0] = '\0'; - for (i = 0; (progname[i] != '\0') && (i < MAX_PROG_NAME); i++) - if (!strcmp(progname+i, "logind")) { - char **newargv; - - newargv = (char **) malloc(sizeof(char *) * 3); - - strcpy(options, "-"); - strncat(options, progname, i); - - argc = 2; - - newargv[0] = argv[0]; - newargv[1] = options; - newargv[2] = NULL; - - argv = newargv; - break; - } - if (options[0] == '\0') { - usage(); - exit(1); - } - } /* Analyse parameters. */ opterr = 0; diff --git a/src/appl/bsd/krshd.M b/src/appl/bsd/krshd.M index 8c2bb2fba..afa517690 100644 --- a/src/appl/bsd/krshd.M +++ b/src/appl/bsd/krshd.M @@ -63,7 +63,7 @@ mechanisms. This is the same as including \fB\-4\fP and \fB\-5\fP. .IP \fB\-r\fP Trust the remote hostname as an authentication system using the - \fI.rhosts\fP authorization list. + \fI.rhosts\fP authorization list. This option may be desupported in a future version. .IP \fB\-e\fP @@ -81,10 +81,6 @@ authentication do not include this checksum. If this option is specified, older Kerberos5 clients that do not send a checksum in the authenticator will not be able to authenticate to this server. -.PP -If no command-line arguments are present, then the presence of the -letters kKrR in the program-name before "shd" determine the -behaviour of the program exactly as with the command-line arguments. .PP If the \fB\-r\fP or \fB\-R\fP options are used, the client must connect from a privileged port. diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c index 36223c640..6cae876c2 100644 --- a/src/appl/bsd/krshd.c +++ b/src/appl/bsd/krshd.c @@ -279,31 +279,6 @@ main(argc, argv) krb5_init_ets(bsd_context); #endif - if (argc == 1) { /* Get parameters from program name. */ - if (strlen(progname) > MAX_PROG_NAME) { - usage(); - exit(1); - } - options = (char *) malloc(MAX_PROG_NAME+1); - options[0] = '\0'; - for (i = 0; (progname[i] != '\0') && (i < MAX_PROG_NAME); i++) - if (!strcmp(progname+i, "shd")) { - strcpy(options, "-"); - strncat(options, progname, i); - options[i+1] = '\0'; -#if 0 - /* - * Since we are just going to break out afterwards, we'll - * re-use the variable "i" to move the command line args. - */ - for (i=argc-1; i>0; i--) argv[i+1] = argv[i]; -#endif - argv[++argc] = NULL; - - argv[1] = options; - break; - } - } /* Analyze parameters. */ opterr = 0; -- 2.26.2