* admin_server.c (process_client): allow keytab to be specified on

 	command line; default is still wrong

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9125 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index e9aa5c9db41201965e2abdffd4dcf6adb56a1245..8fdc9415e657f6d68507c8550f64f2941294846e 100644 (file)
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 26 17:54:33 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+       * admin_server.c (process_client): allow keytab to be specified on
+       command line; default is still wrong
+
 Mon Sep 23 15:36:41 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * configure.in: add unit-test subdir

diff --git a/src/kadmin/v4server/admin_server.c b/src/kadmin/v4server/admin_server.c
index 2d2c253cf84e10d93fcfa66671109e1117628eb8..e9b09bea1b06cf72cd03c01f7bb9a9c80581e63f 100644 (file)
--- a/src/kadmin/v4server/admin_server.c
+++ b/src/kadmin/v4server/admin_server.c
@@ -66,6 +66,11 @@ admin_params prm;            /* The command line parameters struct */
 char prog[32];                 /* WHY IS THIS NEEDED??????? */
 char *progname = prog;
 char *acldir = DEFAULT_ACL_DIR;
+#ifdef OVSEC_KADM
+char *keytab = "FILE:/krb5/ovsec_adm.srvtab";
+#else
+char *keytab = NULL;
+#endif
 char krbrlm[REALM_SZ];
 extern Kadm_Server server_parm;
 krb5_context kadm_context;
@@ -113,7 +118,7 @@ char *argv[];
     memset(krbrlm, 0, sizeof(krbrlm));
 
     fascist_cpw = 1;           /* by default, enable fascist mode */
-    while ((c = getopt(argc, argv, "Df:hnd:a:r:FN")) != EOF)
+    while ((c = getopt(argc, argv, "Df:hnd:a:r:FNk:")) != EOF)
        switch(c) {
        case 'D':
            debug++;
@@ -147,7 +152,10 @@ char *argv[];
        case 'r':
            (void) strncpy(krbrlm, optarg, sizeof(krbrlm) - 1);
            break;
-       case 'h':                       /* get help on using admin_server */
+        case 'k':
+           keytab = optarg;
+           break;
+        case 'h':                      /* get help on using admin_server */
        default:
            printf("Usage: admin_server [-h] [-n] [-F] [-N] [-r realm] [-d dbname] [-f filename] [-a acldir]\n");
            exit(-1);                   /* failure */
@@ -302,8 +310,10 @@ kadm_listen()
         }
     }
     if (bind(admin_fd, (struct sockaddr *)&server_parm.admin_addr,
-            sizeof(struct sockaddr_in)) < 0)
-       return KADM_NO_BIND;
+            sizeof(struct sockaddr_in)) < 0) {
+        syslog(LOG_ERR, "bind: %m");
+        return KADM_NO_BIND;
+    }
     (void) listen(admin_fd, 1);
     FD_ZERO(&mask);
     FD_SET(admin_fd, &mask);
@@ -383,7 +393,6 @@ void process_client(fd, who)
     int status;
 
 #ifdef OVSEC_KADM
-#define OVSEC_KADM_SRVTAB              "FILE:/krb5/ovsec_adm.srvtab"
     char *service_name;
 
     service_name = (char *) malloc(strlen(server_parm.sname) +
@@ -397,7 +406,7 @@ void process_client(fd, who)
            server_parm.sinst, server_parm.krbrlm);
 
     retval = ovsec_kadm_init_with_skey(service_name,
-                                      OVSEC_KADM_SRVTAB,
+                                      keytab,
                                       OVSEC_KADM_ADMIN_SERVICE, krbrlm,
                                       OVSEC_KADM_STRUCT_VERSION,
                                       OVSEC_KADM_API_VERSION_1,