lib:cmdline: Implement legacy kerberos options

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/cmdline/cmdline.c b/lib/cmdline/cmdline.c
index 1171a05be4936ed16f6f7bede6e50fe91fa76d61..41c6463a3b8ff1e35be7d60edfdd64a0d1fdfc19 100644 (file)
--- a/lib/cmdline/cmdline.c
+++ b/lib/cmdline/cmdline.c
@@ -870,6 +870,118 @@ static struct poptOption popt_common_version[] = {
        POPT_TABLEEND
 };
 
+/**********************************************************
+ * LEGACY S3 POPT
+ **********************************************************/
+
+static void popt_legacy_s3_callback(poptContext ctx,
+                                   enum poptCallbackReason reason,
+                                   const struct poptOption *opt,
+                                   const char *arg,
+                                   const void *data)
+{
+       struct cli_credentials *creds = samba_cmdline_get_creds();
+       bool ok;
+
+       switch(opt->val) {
+       case 'k':
+               fprintf(stderr,
+                       "WARNING: The option -k|--kerberos is deprecated!\n");
+
+               ok = cli_credentials_set_kerberos_state(creds,
+                                                       CRED_USE_KERBEROS_REQUIRED,
+                                                       CRED_SPECIFIED);
+               if (!ok) {
+                       fprintf(stderr,
+                               "Failed to set Kerberos state to %s!\n", arg);
+                       exit(1);
+               }
+
+               skip_password_callback = true;
+               break;
+       }
+}
+
+/* We allow '-k yes' too. */
+static struct poptOption popt_legacy_s3[] = {
+       {
+               .argInfo    = POPT_ARG_CALLBACK,
+               .arg        = (void *)popt_legacy_s3_callback,
+       },
+       {
+               .longName   = "kerberos",
+               .shortName  = 'k',
+               .argInfo    = POPT_ARG_STRING,
+               .val        = 'k',
+               .descrip    = "DEPRECATED: Migrate to --use-kerberos",
+       },
+       POPT_TABLEEND
+};
+
+/**********************************************************
+ * LEGACY S4 POPT
+ **********************************************************/
+
+static void popt_legacy_s4_callback(poptContext ctx,
+                                   enum poptCallbackReason reason,
+                                   const struct poptOption *opt,
+                                   const char *arg,
+                                   const void *data)
+{
+       struct cli_credentials *creds = samba_cmdline_get_creds();
+       bool ok;
+
+       switch(opt->val) {
+       case 'k': {
+               enum credentials_use_kerberos use_kerberos =
+                       CRED_USE_KERBEROS_REQUIRED;
+
+               fprintf(stderr,
+                       "WARNING: The option -k|--kerberos is deprecated!\n");
+
+               if (arg != NULL) {
+                       if (strcasecmp_m(arg, "yes") == 0) {
+                               use_kerberos = CRED_USE_KERBEROS_REQUIRED;
+                       } else if (strcasecmp_m(arg, "no") == 0) {
+                               use_kerberos = CRED_USE_KERBEROS_DISABLED;
+                       } else {
+                               fprintf(stderr,
+                                       "Error parsing -k %s. Should be "
+                                       "-k [yes|no]\n",
+                                       arg);
+                               exit(1);
+                       }
+               }
+
+               ok = cli_credentials_set_kerberos_state(creds,
+                                                       use_kerberos,
+                                                       CRED_SPECIFIED);
+               if (!ok) {
+                       fprintf(stderr,
+                               "Failed to set Kerberos state to %s!\n", arg);
+                       exit(1);
+               }
+
+               break;
+       }
+       }
+}
+
+static struct poptOption popt_legacy_s4[] = {
+       {
+               .argInfo    = POPT_ARG_CALLBACK,
+               .arg        = (void *)popt_legacy_s4_callback,
+       },
+       {
+               .longName   = "kerberos",
+               .shortName  = 'k',
+               .argInfo    = POPT_ARG_STRING,
+               .val        = 'k',
+               .descrip    = "DEPRECATED: Migrate to --use-kerberos",
+       },
+       POPT_TABLEEND
+};
+
 struct poptOption *samba_cmdline_get_popt(enum smb_cmdline_popt_options opt)
 {
        switch (opt) {
@@ -888,6 +1000,12 @@ struct poptOption *samba_cmdline_get_popt(enum smb_cmdline_popt_options opt)
        case SAMBA_CMDLINE_POPT_OPT_SAMBA_LDB:
                return popt_common_samba_ldb;
                break;
+       case SAMBA_CMDLINE_POPT_OPT_LEGACY_S3:
+               return popt_legacy_s3;
+               break;
+       case SAMBA_CMDLINE_POPT_OPT_LEGACY_S4:
+               return popt_legacy_s4;
+               break;
        }
 
        /* Never reached */

diff --git a/lib/cmdline/cmdline.h b/lib/cmdline/cmdline.h
index 899c82d742caf8dc5199f25390f703f4272845cc..c3667a5884c421cf788c86111203668f49721126 100644 (file)
--- a/lib/cmdline/cmdline.h
+++ b/lib/cmdline/cmdline.h
@@ -43,6 +43,8 @@ enum smb_cmdline_popt_options {
        SAMBA_CMDLINE_POPT_OPT_CREDENTIALS,
        SAMBA_CMDLINE_POPT_OPT_VERSION,
        SAMBA_CMDLINE_POPT_OPT_SAMBA_LDB,
+       SAMBA_CMDLINE_POPT_OPT_LEGACY_S3,
+       SAMBA_CMDLINE_POPT_OPT_LEGACY_S4,
 };
 
 /**
@@ -149,4 +151,24 @@ struct poptOption *samba_cmdline_get_popt(enum smb_cmdline_popt_options opt);
        .descrip    = "Common Samba options:", \
        .argDescrip = NULL },
 
+/* TODO Get rid of me! */
+#define POPT_LEGACY_S3 { \
+       .longName   = NULL, \
+       .shortName  = '\0', \
+       .argInfo    = POPT_ARG_INCLUDE_TABLE, \
+       .arg        = samba_cmdline_get_popt(SAMBA_CMDLINE_POPT_OPT_LEGACY_S3), \
+       .val        = 0, \
+       .descrip    = "Deprecated legcacy options:", \
+       .argDescrip = NULL },
+
+/* TODO Get rid of me! */
+#define POPT_LEGACY_S4 { \
+       .longName   = NULL, \
+       .shortName  = '\0', \
+       .argInfo    = POPT_ARG_INCLUDE_TABLE, \
+       .arg        = samba_cmdline_get_popt(SAMBA_CMDLINE_POPT_OPT_LEGACY_S4), \
+       .val        = 0, \
+       .descrip    = "Deprecated legcacy options:", \
+       .argDescrip = NULL },
+
 #endif /* _CMDLINE_H */