Changeset 746 for vendor/current/source3/utils

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

Location:

vendor/current/source3/utils

Files:

• net_ads.c (modified) (1 diff)
• net_groupmap.c (modified) (1 diff)
• net_idmap_check.c (modified) (3 diffs)
• net_lookup.c (modified) (3 diffs)
• net_rpc.c (modified) (4 diffs)

vendor/current/source3/utils/net_ads.c

@@ -2208 +2208 @@
         attrs = (argv + 1);
 
-        rc = ads_do_search_all(ads, ads->config.bind_path,
+        rc = ads_do_search_retry(ads, ads->config.bind_path,
                                LDAP_SCOPE_SUBTREE,
                                ldap_exp, attrs, &res);

vendor/current/source3/utils/net_groupmap.c

@@ -824 +824 @@
                 d_printf("%s\n%s",
                          _("Usage:"),
-                         _("net groupmap memberof sid\n"));
+                         _("net groupmap memberships sid\n"));
                 return -1;
         }

vendor/current/source3/utils/net_idmap_check.c

@@ -891 +891 @@
         }
 
-        status = dbwrap_traverse(ctx->db, traverse_check, ctx);
+        status = dbwrap_traverse(ctx->db, traverse_check, ctx, NULL);
 
         if (!NT_STATUS_IS_OK(status)) {
@@ -928 +928 @@
 
 static void check_diff_list(struct check_ctx* ctx) {
-        NTSTATUS status = dbwrap_traverse(ctx->diff, traverse_print_diff, ctx);
+        NTSTATUS status = dbwrap_traverse(ctx->diff, traverse_print_diff, ctx, NULL);
 
         if (!NT_STATUS_IS_OK(status)) {
@@ -964 +964 @@
         }
 
-        status = dbwrap_traverse(ctx->diff, traverse_commit, ctx);
+        status = dbwrap_traverse(ctx->diff, traverse_commit, ctx, NULL);
 
         if (!NT_STATUS_IS_OK(status)) {

vendor/current/source3/utils/net_lookup.c

@@ -277 +277 @@
         krb5_error_code rc;
         krb5_context ctx;
-        struct sockaddr_in *addrs;
-        int num_kdcs,i;
-        krb5_data realm;
-        char **realms;
+        struct ip_service *kdcs;
+        const char *realm;
+        int num_kdcs = 0;
+        int i;
+        NTSTATUS status;
 
         initialize_krb5_error_table();
@@ -290 +291 @@
         }
 
-        if (argc>0) {
-                realm.data = CONST_DISCARD(char *, argv[0]);
-                realm.length = strlen(argv[0]);
+        if (argc > 0) {
+                realm = argv[0];
         } else if (lp_realm() && *lp_realm()) {
-                realm.data = lp_realm();
-                realm.length = strlen((const char *)realm.data);
+                realm = lp_realm();
         } else {
+                char **realms;
+
                 rc = krb5_get_host_realm(ctx, NULL, &realms);
                 if (rc) {
@@ -303 +304 @@
                         return -1;
                 }
-                realm.data = (char *) *realms;
-                realm.length = strlen((const char *)realm.data);
-        }
-
-        rc = smb_krb5_locate_kdc(ctx, &realm, (struct sockaddr **)(void *)&addrs, &num_kdcs, 0);
-        if (rc) {
-                DEBUG(1, ("smb_krb5_locate_kdc failed (%s)\n", error_message(rc)));
-                return -1;
-        }
-        for (i=0;i<num_kdcs;i++)
-                if (addrs[i].sin_family == AF_INET)
-                        d_printf("%s:%hd\n", inet_ntoa(addrs[i].sin_addr),
-                                 ntohs(addrs[i].sin_port));
-        return 0;
-
+                realm = (const char *) *realms;
+        }
+
+        status = get_kdc_list(realm, NULL, &kdcs, &num_kdcs);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(1,("get_kdc_list failed (%s)\n", nt_errstr(status)));
+                return -1;
+        }
+
+        for (i = 0; i < num_kdcs; i++) {
+                char addr[INET6_ADDRSTRLEN];
+
+                print_sockaddr(addr, sizeof(addr), &kdcs[i].ss);
+
+                d_printf("%s:%hd\n", addr, kdcs[i].port);
+        }
+
+        return 0;
 #endif
         DEBUG(1, ("No kerberos support\n"));

vendor/current/source3/utils/net_rpc.c

@@ -4903 +4903 @@
 }
 
-struct share_list {
-        int num_shares;
-        char **shares;
-};
-
-static void collect_share(const char *name, uint32 m,
-                          const char *comment, void *state)
-{
-        struct share_list *share_list = (struct share_list *)state;
-
-        if (m != STYPE_DISKTREE)
-                return;
-
-        share_list->num_shares += 1;
-        share_list->shares = SMB_REALLOC_ARRAY(share_list->shares, char *, share_list->num_shares);
-        if (!share_list->shares) {
-                share_list->num_shares = 0;
-                return;
-        }
-        share_list->shares[share_list->num_shares-1] = SMB_STRDUP(name);
-}
-
 /**
  * List shares on a remote RPC server, including the security descriptors.
@@ -4950 +4928 @@
                                                 const char **argv)
 {
-        int ret;
         bool r;
-        uint32 i;
         FILE *f;
+        NTSTATUS nt_status = NT_STATUS_OK;
+        uint32_t total_entries = 0;
+        uint32_t resume_handle = 0;
+        uint32_t preferred_len = 0xffffffff;
+        uint32_t i;
+        struct dcerpc_binding_handle *b = NULL;
+        struct srvsvc_NetShareInfoCtr info_ctr;
+        struct srvsvc_NetShareCtr1 ctr1;
+        WERROR result;
 
         struct user_token *tokens = NULL;
         int num_tokens = 0;
-
-        struct share_list share_list;
 
         if (argc == 0) {
@@ -4984 +4967 @@
                 collect_alias_memberships(&tokens[i].token);
 
-        share_list.num_shares = 0;
-        share_list.shares = NULL;
-
-        ret = cli_RNetShareEnum(cli, collect_share, &share_list);
-
-        if (ret == -1) {
-                DEBUG(0, ("Error returning browse list: %s\n",
-                          cli_errstr(cli)));
-                goto done;
-        }
-
-        for (i = 0; i < share_list.num_shares; i++) {
-                char *netname = share_list.shares[i];
-
-                if (netname[strlen(netname)-1] == '$')
+        ZERO_STRUCT(info_ctr);
+        ZERO_STRUCT(ctr1);
+
+        info_ctr.level = 1;
+        info_ctr.ctr.ctr1 = &ctr1;
+
+        b = pipe_hnd->binding_handle;
+
+        /* Issue the NetShareEnum RPC call and retrieve the response */
+        nt_status = dcerpc_srvsvc_NetShareEnumAll(b,
+                                        talloc_tos(),
+                                        pipe_hnd->desthost,
+                                        &info_ctr,
+                                        preferred_len,
+                                        &total_entries,
+                                        &resume_handle,
+                                        &result);
+
+        /* Was it successful? */
+        if (!NT_STATUS_IS_OK(nt_status)) {
+                /*  Nope.  Go clean up. */
+                goto done;
+        }
+
+        if (!W_ERROR_IS_OK(result)) {
+                /*  Nope.  Go clean up. */
+                nt_status = werror_to_ntstatus(result);
+                goto done;
+        }
+
+        if (total_entries == 0) {
+                goto done;
+        }
+
+        /* For each returned entry... */
+        for (i = 0; i < info_ctr.ctr.ctr1->count; i++) {
+                const char *netname = info_ctr.ctr.ctr1->array[i].name;
+
+                if (info_ctr.ctr.ctr1->array[i].type != STYPE_DISKTREE) {
                         continue;
+                }
 
                 d_printf("%s\n", netname);
@@ -5011 +5019 @@
         }
         SAFE_FREE(tokens);
-        SAFE_FREE(share_list.shares);
-
-        return NT_STATUS_OK;
+
+        return nt_status;
 }