Changeset 342 for branches/samba-3.3.x/source/utils

Timestamp:

Oct 30, 2009, 9:39:05 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 to 3.3.9

Location:

branches/samba-3.3.x/source/utils

Files:

• net.h (modified) (1 diff)
• net_join.c (modified) (1 diff)
• net_rpc.c (modified) (5 diffs)
• net_rpc_join.c (modified) (2 diffs)
• net_rpc_samsync.c (modified) (1 diff)

branches/samba-3.3.x/source/utils/net.h

@@ -158 +158 @@
 #define NET_FLAGS_SIGN                          0x00000040      /* sign RPC connection */
 #define NET_FLAGS_SEAL                          0x00000080      /* seal RPC connection */
+#define NET_FLAGS_TCP                           0x00000100      /* use ncacn_ip_tcp */
 
 /* net share operation modes */

branches/samba-3.3.x/source/utils/net_join.c

@@ -35 +35 @@
 int net_join(struct net_context *c, int argc, const char **argv)
 {
-        if (argc < 1)
-                return net_join_usage(c, argc, argv);
-
-        if (StrCaseCmp(argv[0], "HELP") == 0) {
+        if ((argc > 0) && (StrCaseCmp(argv[0], "HELP") == 0)) {
                 net_join_usage(c, argc, argv);
                 return 0;

branches/samba-3.3.x/source/utils/net_rpc.c

@@ -158 +158 @@
                         /* Always try and create an schannel netlogon pipe. */
                         nt_status = cli_rpc_pipe_open_schannel(
-                                cli, interface,
+                                cli, interface, NCACN_NP,
                                 PIPE_AUTH_LEVEL_PRIVACY, domain_name,
                                 &pipe_hnd);
@@ -170 +170 @@
                                 nt_status = cli_rpc_pipe_open_ntlmssp(
                                         cli, interface,
+                                        (conn_flags & NET_FLAGS_TCP) ?
+                                        NCACN_IP_TCP : NCACN_NP,
                                         PIPE_AUTH_LEVEL_PRIVACY,
                                         lp_workgroup(), c->opt_user_name,
@@ -797 +799 @@
                                   argv[0],
                                   0,
-                                  (uint8_t **)&u0,
+                                  (uint8_t **)(void *)&u0,
                                   (uint32_t)-1,
                                   &entries_read,
@@ -2997 +2999 @@
         status = NetShareEnum(c->opt_host,
                               level,
-                              (uint8_t **)&i1,
+                              (uint8_t **)(void *)&i1,
                               (uint32_t)-1,
                               &entries_read,
@@ -4773 +4775 @@
                              username,
                              3,
-                             (uint8_t **)&i3,
+                             (uint8_t **)(void *)&i3,
                              preferred_len,
                              &entries_read,

branches/samba-3.3.x/source/utils/net_rpc_join.c

@@ -101 +101 @@
 
         ntret = cli_rpc_pipe_open_schannel_with_key(
-                cli, &ndr_table_netlogon.syntax_id, PIPE_AUTH_LEVEL_PRIVACY,
+                cli, &ndr_table_netlogon.syntax_id, NCACN_NP,
+                PIPE_AUTH_LEVEL_PRIVACY,
                 domain, netlogon_pipe->dc, &pipe_hnd);
 
@@ -420 +421 @@
 
                 result = cli_rpc_pipe_open_schannel_with_key(
-                        cli, &ndr_table_netlogon.syntax_id,
+                        cli, &ndr_table_netlogon.syntax_id, NCACN_NP,
                         PIPE_AUTH_LEVEL_PRIVACY, domain, pipe_hnd->dc,
                         &netlogon_schannel_pipe);

branches/samba-3.3.x/source/utils/net_rpc_samsync.c

@@ -503 +503 @@
         } else {
                 ret = run_rpc_command(c, cli, &ndr_table_drsuapi.syntax_id,
-                                      NET_FLAGS_SEAL,
+                                      NET_FLAGS_SEAL | NET_FLAGS_TCP,
                                       rpc_vampire_keytab_ds_internals, argc, argv);
         }