From: Paul Park Date: Fri, 5 May 1995 15:29:28 +0000 (+0000) Subject: Remove language support flags X-Git-Tag: krb5-1.0-beta5~19 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0ab7ec99f496204d5e8cbbf5fd821a91abdd462f;p=krb5.git Remove language support flags git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5734 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog index e6d64deee..55adb1a23 100644 --- a/src/kadmin/kpasswd/ChangeLog +++ b/src/kadmin/kpasswd/ChangeLog @@ -1,4 +1,8 @@ +Fri May 5 11:07:52 EDT 1995 Paul Park (pjpark@mit.edu) + #ifdef out language and support. Remove description from manpage. + + Fri Apr 28 10:14:12 EDT 1995 Paul Park (pjpark@mit.edu) * Use new library libkadm. Remove unused reference to libkdb5. * Use size_t instead of int for size calculations. diff --git a/src/kadmin/kpasswd/kpasswd.M b/src/kadmin/kpasswd/kpasswd.M index 7442331a6..a8c2836f0 100644 --- a/src/kadmin/kpasswd/kpasswd.M +++ b/src/kadmin/kpasswd/kpasswd.M @@ -27,11 +27,6 @@ kpasswd \- change a user's Kerberos password .SH SYNOPSIS .B kpasswd [ -.B \-m -] [ -.B \-l -language -] [ .B \-u .IR username[/instance][@realm] ] @@ -41,29 +36,13 @@ The command is used to change a Kerberos principal's password. If the -.I \-n +.I \-u option is specified, a partially or fully qualified Kerberos principal may be supplied. Otherwise, the principal name is derived from the identity of the user invoking the .I kpasswd command. -The -.I \-l -and -.I \-m -flags may be specified to qualify how the administrative server is to issue -messages. The -.I \-l -flag specifies which -.I language -to issue messages in, while the -.I \-m -flag enables MIME-encoded messages. The support of these flags and the -interpretation of the -.I language -paramter is specific to the administrative server. - .PP The .I kpasswd diff --git a/src/kadmin/kpasswd/kpasswd.c b/src/kadmin/kpasswd/kpasswd.c index e2f287ba7..452e92ce5 100644 --- a/src/kadmin/kpasswd/kpasswd.c +++ b/src/kadmin/kpasswd/kpasswd.c @@ -56,7 +56,11 @@ static const char *kpwd_change_prompt_2 = "Re-enter new password: "; static const char *kpwd_old_password_prompt = " Enter old password: "; static const char *kpwd_old_pwd_name_fmt = "Enter old password for %s: "; -static const char *kpwd_usage_error_fmt = "%s: usage is %s [-u user] [-m] [-l language].\n"; +#ifdef LANGUAGES_SUPPORTED +static const char *kpwd_usage_error_fmt = "%s: usage is %s [-u user] [-l language]\n"; +#else /* LANGUAGES_SUPPORTED */ +static const char *kpwd_usage_error_fmt = "%s: usage is %s [-u user]\n"; +#endif /* LANGUAGES_SUPPORTED */ static const char *kpwd_extra_args = "extra arguments"; static const char *kpwd_bad_option_fmt = "%s: unrecognized option -%c.\n"; static const char *kpwd_no_memory_fmt = "%s: not enough resources to allocate %d bytes for %s.\n"; @@ -144,6 +148,9 @@ kpwd_print_sreply(progname, ncomps, complist) krb5_data *complist; { krb5_int32 i; + /* + * If language/mime suporrt enabled, need to have mime-decoder here. + */ if (ncomps > 0) { fprintf(stderr, "%s - %s: %s\n", progname, kpwd_serror_head, complist[0].data); @@ -189,7 +196,7 @@ main(argc, argv) /* * Usage is: - * kpasswd [-u user] [-m] [-l language] + * kpasswd [-u user] [-l language] */ while ((option = getopt(argc, argv, "l:mu:")) != EOF) { switch (option) { @@ -202,11 +209,10 @@ main(argc, argv) } strcpy(name, optarg); break; - case 'm': - mflag++; - break; +#ifdef LANGUAGES_SUPPORTED case 'l': lflag++; + mflag++; if ((language = (char *) malloc(strlen(optarg)+1)) == NULL) { fprintf(stderr, kpwd_no_memory_fmt, argv[0], strlen(optarg)+1, kpwd_args_text); @@ -215,6 +221,7 @@ main(argc, argv) } strcpy(language, optarg); break; +#endif /* LANGUAGES_SUPPORTED */ default: error++; break; @@ -299,6 +306,7 @@ main(argc, argv) free(opwd_prompt); send_quit = 1; +#ifdef LANGUAGES_SUPPORTED /* * We have the connection - see if we have to send some precursory data. */ @@ -393,6 +401,7 @@ main(argc, argv) } krb5_free_adm_data(kcontext, lang_ncomps, lang_reply); } +#endif /* LANGUAGES_SUPPORTED */ /* Now - Actually change the password. */ for (npass_tries = 1; npass_tries <= KPWD_MAX_TRIES; npass_tries++) { diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog index c8daf39b6..0cacb68a9 100644 --- a/src/kadmin/v5server/ChangeLog +++ b/src/kadmin/v5server/ChangeLog @@ -1,4 +1,8 @@ +Fri May 5 11:11:39 EDT 1995 Paul Park (pjpark@mit.edu) + #ifdef out language flags. Remove description from manpage. + + Fri Apr 28 17:58:11 EDT 1995 Paul Park (pjpark@mit.edu) * proto_serv.c - ifdef-out commands which are not fully supported. diff --git a/src/kadmin/v5server/kadmind5.M b/src/kadmin/v5server/kadmind5.M index b5d7dd4aa..01292cb9d 100644 --- a/src/kadmin/v5server/kadmind5.M +++ b/src/kadmin/v5server/kadmind5.M @@ -41,12 +41,6 @@ enctype .B \-k mkeytype ] [ -.B \-l -langlist -] [ -.B \-m -1|0 -] [ .B \-t timeout ] [ @@ -102,16 +96,6 @@ seconds. Enables certain debugging features and messages selected by .B debugmask. .PP -.B Protocol Message flags -.IP \-l -.B langlist -specifies the list of supported language names [not implemented]. -.IP \-m -Enables ( -.B 1 -) or disables ( -.B 0 -) MIME encoding support [not implemented]. .SH ACL FILE .PP diff --git a/src/kadmin/v5server/srv_main.c b/src/kadmin/v5server/srv_main.c index 248e82aba..2d3cda226 100644 --- a/src/kadmin/v5server/srv_main.c +++ b/src/kadmin/v5server/srv_main.c @@ -45,7 +45,11 @@ #define LOG_AUTH 0 #endif /* LOG_AUTH */ -static const char *usage_format = "%s: usage is %s [-a aclfile] [-d database] [-e enctype] [-i]\n\t[-k mkeytype] [-l langlist] [-m bool] [-r realm] [-t timeout]\n\t[-D dbg] [-M mkeyname].\n"; +#ifdef LANGUAGES_SUPPORTED +static const char *usage_format = "%s: usage is %s [-a aclfile] [-d database] [-e enctype] [-i]\n\t[-k mkeytype] [-l langlist] [-r realm] [-t timeout]\n\t[-D dbg] [-M mkeyname].\n"; +#else /* LANGUAGES_SUPPORTED */ +static const char *usage_format = "%s: usage is %s [-a aclfile] [-d database] [-e enctype] [-i]\n\t[-k mkeytype] [-r realm] [-t timeout]\n\t[-D dbg] [-M mkeyname].\n"; +#endif /* LANGUAGES_SUPPORTED */ static const char *fval_not_number = "%s: value (%s) specified for -%c is not numeric.\n"; static const char *extra_params = "%s extra paramters beginning with %s... \n"; static const char *no_memory_fmt = "%s: cannot allocate %d bytes for %s.\n"; @@ -188,15 +192,12 @@ main(argc, argv) error++; } break; +#ifdef LANGUAGES_SUPPORTED case 'l': language_list = optarg; + mime_enabled = 1; break; - case 'm': - if (sscanf(optarg, "%d", &mime_enabled) != 1) { - fprintf(stderr, fval_not_number, argv[0], optarg, 'm'); - error++; - } - break; +#endif /* LANGUAGES_SUPPORTED */ case 'r': db_realm = optarg; break;