Changeset 740 for vendor/current/source4/lib/cmdline

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/lib/cmdline

Files:

• config.mk (deleted)
• popt_common.c (modified) (7 diffs)
• popt_credentials.c (modified) (6 diffs)
• wscript_build (added)

vendor/current/source4/lib/cmdline/popt_common.c

@@ -67 +67 @@
 
         if (reason == POPT_CALLBACK_REASON_POST) {
-                if (lp_configfile(cmdline_lp_ctx) == NULL) {
-            lp_load_default(cmdline_lp_ctx);
+                if (lpcfg_configfile(cmdline_lp_ctx) == NULL) {
+                        lpcfg_load_default(cmdline_lp_ctx);
                 }
                 /* Hook any 'every Samba program must do this, after
@@ -84 +84 @@
 
         if (reason == POPT_CALLBACK_REASON_PRE) {
-                cmdline_lp_ctx = loadparm_init(talloc_autofree_context());
+                cmdline_lp_ctx = loadparm_init_global(false);
 
                 /* Hook for 'almost the first thing to do in a samba program' here */
@@ -109 +109 @@
 
         case OPT_OPTION:
-                if (!lp_set_option(cmdline_lp_ctx, arg)) {
+                if (!lpcfg_set_option(cmdline_lp_ctx, arg)) {
                         fprintf(stderr, "Error setting option '%s'\n", arg);
                         exit(1);
@@ -116 +116 @@
 
         case 'd':
-                lp_set_cmdline(cmdline_lp_ctx, "log level", arg);
+                lpcfg_set_cmdline(cmdline_lp_ctx, "log level", arg);
                 break;
 
@@ -125 +125 @@
         case 's':
                 if (arg) {
-                        lp_load(cmdline_lp_ctx, arg);
+                        lpcfg_load(cmdline_lp_ctx, arg);
                 }
                 break;
@@ -132 +132 @@
                 if (arg) {
                         char *new_logfile = talloc_asprintf(NULL, "%s/log.%s", arg, pname);
-                        lp_set_cmdline(cmdline_lp_ctx, "log file", new_logfile);
+                        lpcfg_set_cmdline(cmdline_lp_ctx, "log file", new_logfile);
                         talloc_free(new_logfile);
                 }
@@ -153 +153 @@
         case 'O':
                 if (arg) {
-                        lp_set_cmdline(lp_ctx, "socket options", arg);
+                        lpcfg_set_cmdline(lp_ctx, "socket options", arg);
                 }
                 break;
         
         case 'W':
-                lp_set_cmdline(lp_ctx, "workgroup", arg);
+                lpcfg_set_cmdline(lp_ctx, "workgroup", arg);
                 break;
 
         case 'r':
-                lp_set_cmdline(lp_ctx, "realm", arg);
+                lpcfg_set_cmdline(lp_ctx, "realm", arg);
                 break;
                 
         case 'n':
-                lp_set_cmdline(lp_ctx, "netbios name", arg);
+                lpcfg_set_cmdline(lp_ctx, "netbios name", arg);
                 break;
                 
         case 'i':
-                lp_set_cmdline(lp_ctx, "netbios scope", arg);
+                lpcfg_set_cmdline(lp_ctx, "netbios scope", arg);
                 break;
 
         case 'm':
-                lp_set_cmdline(lp_ctx, "client max protocol", arg);
+                lpcfg_set_cmdline(lp_ctx, "client max protocol", arg);
                 break;
 
         case 'R':
-                lp_set_cmdline(lp_ctx, "name resolve order", arg);
+                lpcfg_set_cmdline(lp_ctx, "name resolve order", arg);
                 break;
 
         case 'S':
-                lp_set_cmdline(lp_ctx, "client signing", arg);
+                lpcfg_set_cmdline(lp_ctx, "client signing", arg);
                 break;
 

vendor/current/source4/lib/cmdline/popt_credentials.c

@@ -32 +32 @@
  *              -N,--no-pass
  *              -S,--signing
- *              -P --machine-pass
- *                 --simple-bind-dn
- *                 --password
+ *              -P,--machine-pass
+ *              --simple-bind-dn
+ *              --password
  */
 
+static bool dont_ask;
+static bool machine_account_pending;
 
-static bool dont_ask;
-
-enum opt { OPT_SIMPLE_BIND_DN, OPT_PASSWORD, OPT_KERBEROS };
+enum opt { OPT_SIMPLE_BIND_DN, OPT_PASSWORD, OPT_KERBEROS, OPT_SIGN, OPT_ENCRYPT };
 
 /*
@@ -66 +66 @@
                         cli_credentials_set_cmdline_callbacks(cmdline_credentials);
                 }
+
+                if (machine_account_pending) {
+                        cli_credentials_set_machine_account(cmdline_credentials, cmdline_lp_ctx);
+                }
+
                 return;
+
         }
 
@@ -97 +103 @@
         case 'P':
                 /* Later, after this is all over, get the machine account details from the secrets.ldb */
-                cli_credentials_set_machine_account_pending(cmdline_credentials, cmdline_lp_ctx);
+                machine_account_pending = true;
                 break;
 
@@ -106 +112 @@
                 if (arg) {
                         if (!set_boolean(arg, &use_kerberos)) {
-                                fprintf(stderr, "Error parsing -k %s\n", arg);
+                                fprintf(stderr, "Error parsing -k %s. Should be "
+                                        "-k [yes|no]\n", arg);
                                 exit(1);
                                 break;
@@ -120 +127 @@
                 
         case OPT_SIMPLE_BIND_DN:
+        {
                 cli_credentials_set_bind_dn(cmdline_credentials, arg);
                 break;
+        }
+        case OPT_SIGN:
+        {
+                uint32_t gensec_features;
+
+                gensec_features = cli_credentials_get_gensec_features(cmdline_credentials);
+
+                gensec_features |= GENSEC_FEATURE_SIGN;
+                cli_credentials_set_gensec_features(cmdline_credentials,
+                                                    gensec_features);
+                break;
+        }
+        case OPT_ENCRYPT:
+        {
+                uint32_t gensec_features;
+
+                gensec_features = cli_credentials_get_gensec_features(cmdline_credentials);
+
+                gensec_features |= GENSEC_FEATURE_SEAL;
+                cli_credentials_set_gensec_features(cmdline_credentials,
+                                                    gensec_features);
+                break;
+        }
         }
 }
@@ -135 +166 @@
         { "machine-pass", 'P', POPT_ARG_NONE, NULL, 'P', "Use stored machine account password (implies -k)" },
         { "simple-bind-dn", 0, POPT_ARG_STRING, NULL, OPT_SIMPLE_BIND_DN, "DN to use for a simple bind" },
-        { "kerberos", 'k', POPT_ARG_STRING, NULL, OPT_KERBEROS, "Use Kerberos" },
+        { "kerberos", 'k', POPT_ARG_STRING, NULL, OPT_KERBEROS, "Use Kerberos, -k [yes|no]" },
+        { "sign", 'S', POPT_ARG_NONE, NULL, OPT_SIGN, "Sign connection to prevent modification in transit" },
+        { "encrypt", 'e', POPT_ARG_NONE, NULL, OPT_ENCRYPT, "Encrypt connection for privacy" },
         { NULL }
 };