net: add "-k" switch for kerberos authentication (in preparation for #5416).

Guenther

diff --git a/source/utils/net.c b/source/utils/net.c
index c4b31d46b07d172eaaa87e96f88eb114971e2df5..edb977b0a9f71e30e9244f7b612388879bc0ae11 100644 (file)
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -68,6 +68,7 @@ int opt_stdin = 0;
 int opt_port = 0;
 int opt_verbose = 0;
 int opt_maxusers = -1;
+int opt_kerberos = 0;
 const char *opt_comment = "";
 const char *opt_container = NULL;
 int opt_flags = -1;
@@ -1043,6 +1044,7 @@ static struct functable net_func[] = {
                {"stdin",       'i', POPT_ARG_NONE,   &opt_stdin},
                {"timeout",     't', POPT_ARG_INT,    &opt_timeout},
                {"machine-pass",'P', POPT_ARG_NONE,   &opt_machine_pass},
+               {"kerberos",    'k', POPT_ARG_NONE,   &opt_kerberos},
                {"myworkgroup", 'W', POPT_ARG_STRING, &opt_workgroup},
                {"verbose",     'v', POPT_ARG_NONE,   &opt_verbose},
                {"test",        'T', POPT_ARG_NONE,   &opt_testmode},

diff --git a/source/utils/net.h b/source/utils/net.h
index f0436688ab33b4e024158fe11ce464981344942c..6902b245e4db6646c2a83cdc00f130eb6821ef67 100644 (file)
--- a/source/utils/net.h
+++ b/source/utils/net.h
@@ -86,6 +86,7 @@ enum netdom_domain_t { ND_TYPE_NT4, ND_TYPE_AD };
 #define NET_MODE_SHARE_MIGRATE 1
 
 extern int opt_maxusers;
+extern int opt_kerberos;
 extern const char *opt_comment;
 extern const char *opt_container;
 extern int opt_flags;

diff --git a/source/utils/net_help.c b/source/utils/net_help.c
index c4accf01162972149824b99c8a35b28b8421abd5..fd93fe67fd2596c567b7136aca3ce8b4e317ad5f 100644 (file)
--- a/source/utils/net_help.c
+++ b/source/utils/net_help.c
@@ -48,7 +48,8 @@ int net_common_flags_usage(int argc, const char **argv)
        d_printf("\t-l or --long\t\t\tDisplay full information\n");
        d_printf("\t-V or --version\t\t\tPrint samba version information\n");
        d_printf("\t-P or --machine-pass\t\tAuthenticate as machine account\n");
-       d_printf("\t-e or --encrypt\t\tEncrypt SMB transport (UNIX extended servers only)\n");
+       d_printf("\t-e or --encrypt\t\t\tEncrypt SMB transport (UNIX extended servers only)\n");
+       d_printf("\t-k or --kerberos\t\tUse kerberos (active directory) authentication\n");
        return -1;
 }