[1211] in Kerberos-V5-bugs
krb5b4pl3: slave/{kpropd.c,kprop.h}: make keytab specification on command-line work
daemon@ATHENA.MIT.EDU (Jonathan I. Kamens)
Sun Mar 19 21:17:19 1995
From: "Jonathan I. Kamens" <jik@cam.ov.com>
Date: Sun, 19 Mar 1995 21:20:35 -0500
To: krb5-bugs@MIT.EDU
The patch below removes the "-s srvtab" command-line option, which
never worked anyway, from kpropd, and replaces it with a working "-k
keytab".
--- slave/kprop.h 1995/03/13 21:09:11 1.1
+++ slave/kprop.h 1995/03/13 21:09:41 1.2
@@ -24,7 +24,6 @@
*/
#define KPROP_SERVICE_NAME "host"
-#define KPROP_SRVTAB "/etc/srvtab"
#define TGT_SERVICE_NAME "krbtgt"
#define KPROP_SERVICE "krb5_prop"
#define KPROP_DEFAULT_FILE "/krb5/slave_datatrans"
--- slave/kpropd.c 1995/03/13 21:53:53 1.8
+++ slave/kpropd.c 1995/03/13 21:55:57 1.9
@@ -68,7 +68,6 @@
char *progname;
int debug = 0;
-char *srvtab = 0;
int standalone;
krb5_principal server; /* This is our server principal name */
@@ -102,7 +101,7 @@
static void usage()
{
fprintf(stderr,
- "\nUsage: %s [-r realm] [-s srvtab] [-dS] [-f slave_file]\n",
+ "\nUsage: %s [-r realm] [-k keytab] [-dS] [-f slave_file]\n",
progname);
fprintf(stderr, "\t[-F kerberos_db_file ] [-p kdb5_edit_pathname]\n");
exit(1);
@@ -390,12 +389,12 @@
usage();
word = 0;
break;
- case 's':
+ case 'k':
if (*word)
- srvtab = word;
+ kerb_keytab = word;
else
- srvtab = *argv++;
- if (!srvtab)
+ kerb_keytab = *argv++;
+ if (!kerb_keytab)
usage();
word = 0;
break;
