Changeset 745 for trunk/server/source3/lib/netapi/examples

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c (modified) (1 diff)
• source3/lib/netapi/examples/netlogon/nltest.c (modified) (13 diffs)

trunk/server/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c

@@ -479 +479 @@
                         p = strchr(newname, '.');
                         if (p) {
-                                *p = NULL;
+                                *p = ;
                         }
 

trunk/server/source3/lib/netapi/examples/netlogon/nltest.c

@@ -31 +31 @@
 
 enum {
-        OPT_DBFLAG = 1,
+        OPT_SERVER = 1,
+        OPT_DBFLAG,
         OPT_SC_QUERY,
         OPT_SC_RESET,
         OPT_SC_VERIFY,
-        OPT_SC_CHANGE_PWD
+        OPT_SC_CHANGE_PWD,
+        OPT_DSGETDC,
+        OPT_PDC,
+        OPT_DS,
+        OPT_DSP,
+        OPT_GC,
+        OPT_KDC,
+        OPT_TIMESERV,
+        OPT_GTIMESERV,
+        OPT_WS,
+        OPT_NETBIOS,
+        OPT_DNS,
+        OPT_IP,
+        OPT_FORCE,
+        OPT_WRITABLE,
+        OPT_AVOIDSELF,
+        OPT_LDAPONLY,
+        OPT_BACKG,
+        OPT_DS_6,
+        OPT_TRY_NEXT_CLOSEST_SITE,
+        OPT_SITE,
+        OPT_ACCOUNT,
+        OPT_RET_DNS,
+        OPT_RET_NETBIOS,
+        OPT_DSREGDNS
 };
 
@@ -41 +66 @@
 ****************************************************************/
 
-static void print_result(uint32_t level,
-                         uint8_t *buffer)
+static void print_result(uint32_t level,
+                         uint8_t *buffer)
 {
         struct NETLOGON_INFO_1 *i1 = NULL;
@@ -101 +126 @@
 ****************************************************************/
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 int main(int argc, const char **argv)
 {
@@ -106 +184 @@
         NET_API_STATUS status;
         struct libnetapi_ctx *ctx = NULL;
-        const char *server_name = NULL;
+        c = NULL;
         char *opt_domain = NULL;
         int opt_dbflag = 0;
-        uint32_t query_level;
+        int opt_pdc = 0;
+        int opt_ds = 0;
+        int opt_dsp = 0;
+        int opt_gc = 0;
+        int opt_kdc = 0;
+        int opt_timeserv = 0;
+        int opt_gtimeserv = 0;
+        int opt_ws = 0;
+        int opt_netbios = 0;
+        int opt_dns = 0;
+        int opt_ip = 0;
+        int opt_force = 0;
+        int opt_writable = 0;
+        int opt_avoidself = 0;
+        int opt_ldaponly = 0;
+        int opt_backg = 0;
+        int opt_ds_6 = 0;
+        int opt_try_next_closest_site = 0;
+        char *opt_site = NULL;
+        char *opt_account = NULL;
+        int opt_ret_dns = 0;
+        int opt_ret_netbios = 0;
+        int opt_dsregdns = 0;
+        uint32_t query_level = 0;
         uint8_t *buffer = NULL;
+
+
 
         poptContext pc;
         struct poptOption long_options[] = {
                 POPT_AUTOHELP
+
                 {"dbflag", 0, POPT_ARG_INT,   &opt_dbflag, OPT_DBFLAG, "New Debug Flag", "HEXFLAGS"},
                 {"sc_query", 0, POPT_ARG_STRING,   &opt_domain, OPT_SC_QUERY, "Query secure channel for domain on server", "DOMAIN"},
@@ -120 +224 @@
                 {"sc_verify", 0, POPT_ARG_STRING,   &opt_domain, OPT_SC_VERIFY, "Verify secure channel for domain on server", "DOMAIN"},
                 {"sc_change_pwd", 0, POPT_ARG_STRING,   &opt_domain, OPT_SC_CHANGE_PWD, "Change a secure channel password for domain on server", "DOMAIN"},
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 POPT_COMMON_LIBNETAPI_EXAMPLES
                 POPT_TABLEEND
@@ -131 +259 @@
         pc = poptGetContext("nltest", argc, argv, long_options, 0);
 
-        poptSetOtherOptionHelp(pc, "server_name");
+        poptSetOtherOptionHelp(pc, "");
         while((opt = poptGetNextOpt(pc)) != -1) {
         }
-
-        if (!poptPeekArg(pc)) {
-                poptPrintHelp(pc, stderr, 0);
-                goto done;
-        }
-        server_name = poptGetArg(pc);
 
         if (argc == 1) {
@@ -146 +268 @@
         }
 
-        if (!server_name || poptGetArg(pc)) {
-                poptPrintHelp(pc, stderr, 0);
-                goto done;
-        }
-
-        if ((server_name[0] == '/' && server_name[1] == '/') ||
-            (server_name[0] == '\\' && server_name[1] ==  '\\')) {
-                server_name += 2;
-        }
-
         poptResetContext(pc);
 
@@ -161 +273 @@
                 switch (opt) {
 
+
+
+
+
+
+
+
+
+
                 case OPT_DBFLAG:
                         query_level = 1;
-                        status = I_NetLogonControl2(server_name,
+                        status = I_NetLogonControl2(,
                                                     NETLOGON_CONTROL_SET_DBFLAG,
                                                     query_level,
@@ -174 +295 @@
                                 goto done;
                         }
+
+
+
                         break;
                 case OPT_SC_QUERY:
                         query_level = 2;
-                        status = I_NetLogonControl2(server_name,
+                        status = I_NetLogonControl2(,
                                                     NETLOGON_CONTROL_TC_QUERY,
                                                     query_level,
@@ -188 +312 @@
                                 goto done;
                         }
+
+
+
                         break;
                 case OPT_SC_VERIFY:
                         query_level = 2;
-                        status = I_NetLogonControl2(server_name,
+                        status = I_NetLogonControl2(,
                                                     NETLOGON_CONTROL_TC_VERIFY,
                                                     query_level,
@@ -202 +329 @@
                                 goto done;
                         }
+
+
+
                         break;
                 case OPT_SC_RESET:
                         query_level = 2;
-                        status = I_NetLogonControl2(server_name,
+                        status = I_NetLogonControl2(,
                                                     NETLOGON_CONTROL_REDISCOVER,
                                                     query_level,
@@ -216 +346 @@
                                 goto done;
                         }
+
+
+
                         break;
                 case OPT_SC_CHANGE_PWD:
                         query_level = 1;
-                        status = I_NetLogonControl2(server_name,
+                        status = I_NetLogonControl2(,
                                                     NETLOGON_CONTROL_CHANGE_PASSWORD,
                                                     query_level,
@@ -230 +363 @@
                                 goto done;
                         }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                         break;
                 default:
-                        poptPrintHelp(pc, stderr, 0);
-                        goto done;
+                        continue;
                 }
         }
-
-        print_result(query_level, buffer);
 
         printf("The command completed successfully\n");