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

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

Location:

branches/samba-3.3.x/source/utils

Files:

• net_conf.c (modified) (1 diff)
• net_rpc.c (modified) (2 diffs)
• net_rpc_join.c (modified) (4 diffs)
• ntlm_auth.c (modified) (5 diffs)
• profiles.c (modified) (2 diffs)
• sharesec.c (modified) (2 diffs)
• smbget.c (modified) (3 diffs)

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

@@ -577 +577 @@
         }
 
-        if (getpwnam(sharename)) {
-                d_fprintf(stderr, "ERROR: share name %s is already a valid "
-                          "system user name.\n", sharename);
-                goto done;
-        }
-
         if (strequal(sharename, GLOBAL_NAME)) {
                 d_fprintf(stderr,

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

@@ -4379 +4379 @@
         int ret;
         bool r;
-        ENUM_HND hnd;
         uint32 i;
         FILE *f;
@@ -4411 +4410 @@
         for (i=0; i<num_tokens; i++)
                 collect_alias_memberships(&tokens[i].token);
-
-        init_enum_hnd(&hnd, 0);
 
         share_list.num_shares = 0;

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

@@ -244 +244 @@
         CHECK_RPC_ERR(rpccli_samr_Connect2(pipe_hnd, mem_ctx,
                                            pipe_hnd->desthost,
-                                           SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                           SAMR_ACCESS_ENUM_DOMAINS
+                                           | SAMR_ACCESS_OPEN_DOMAIN,
                                            &sam_pol),
                       "could not connect to SAM database");
@@ -251 +252 @@
         CHECK_RPC_ERR(rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
                                              &sam_pol,
-                                             SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                             SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1
+                                             | SAMR_DOMAIN_ACCESS_CREATE_USER
+                                             | SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
                                              domain_sid,
                                              &domain_pol),
@@ -483 +486 @@
 int net_rpc_testjoin(struct net_context *c, int argc, const char **argv)
 {
-        char *domain = smb_xstrdup(c->opt_target_workgroup);
         NTSTATUS nt_status;
 
@@ -494 +496 @@
 
         /* Display success or failure */
-        nt_status = net_rpc_join_ok(c, domain, NULL, NULL);
+        nt_status = net_rpc_join_ok(c, c->opt_target_workgroup, NULL, NULL);
         if (!NT_STATUS_IS_OK(nt_status)) {
                 fprintf(stderr,"Join to domain '%s' is not valid: %s\n",
-                        domain, nt_errstr(nt_status));
-                free(domain);
+                        c->opt_target_workgroup, nt_errstr(nt_status));
                 return -1;
         }
 
-        printf("Join to '%s' is OK\n",domain);
-        free(domain);
+        printf("Join to '%s' is OK\n", c->opt_target_workgroup);
         return 0;
 }

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

@@ -524 +524 @@
         static const char zeros[16] = { 0, };
         NTSTATUS nt_status;
-        char *error_string;
+        char *error_string = NULL;
         uint8 lm_key[8]; 
         uint8 user_sess_key[16]; 
-        char *unix_name;
+        char *unix_name = NULL;
 
         nt_status = contact_winbind_auth_crap(ntlmssp_state->user, ntlmssp_state->domain,
@@ -549 +549 @@
                 }
                 ntlmssp_state->auth_context = talloc_strdup(ntlmssp_state->mem_ctx, unix_name);
-                SAFE_FREE(unix_name);
         } else {
                 DEBUG(NT_STATUS_EQUAL(nt_status, NT_STATUS_ACCESS_DENIED) ? 0 : 3, 
@@ -558 +557 @@
                 ntlmssp_state->auth_context = NULL;
         }
+
+        SAFE_FREE(error_string);
+        SAFE_FREE(unix_name);
         return nt_status;
 }
@@ -1815 +1817 @@
                                 x_fprintf(x_stdout, "Authenticated: No\n");
                                 x_fprintf(x_stdout, "Authentication-Error: %s\n.\n", error_string);
-                                SAFE_FREE(error_string);
                         } else {
                                 static char zeros[16];
@@ -1843 +1844 @@
                                 }
                         }
+                        SAFE_FREE(error_string);
                 }
                 /* clear out the state */

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

@@ -58 +58 @@
 static bool swap_sid_in_acl( SEC_DESC *sd, DOM_SID *s1, DOM_SID *s2 )
 {
-        SEC_ACL *acl;
+        SEC_ACL *theacl;
         int i;
         bool update = False;
@@ -79 +79 @@
         }
 
-        acl = sd->dacl;
-        verbose_output("  DACL: %d entries:\n", acl->num_aces);
-        for ( i=0; i<acl->num_aces; i++ ) {
+        theacl = sd->dacl;
+        verbose_output("  DACL: %d entries:\n", theacl->num_aces);
+        for ( i=0; i<theacl->num_aces; i++ ) {
                 verbose_output("    Trustee SID: %s\n", 
-                        sid_string_tos(&acl->aces[i].trustee));
-                if ( sid_equal( &acl->aces[i].trustee, s1 ) ) {
-                        sid_copy( &acl->aces[i].trustee, s2 );
+                        sid_string_tos(&theacl->aces[i].trustee));
+                if ( sid_equal( &theacl->aces[i].trustee, s1 ) ) {
+                        sid_copy( &theacl->aces[i].trustee, s2 );
                         update = True;
                         verbose_output("    New Trustee SID: %s\n", 
-                                sid_string_tos(&acl->aces[i].trustee));
+                                sid_string_tos(&theacl->aces[i].trustee));
                 }
         }
 
 #if 0
-        acl = sd->sacl;
-        verbose_output("  SACL: %d entries: \n", acl->num_aces);
-        for ( i=0; i<acl->num_aces; i++ ) {
+        theacl = sd->sacl;
+        verbose_output("  SACL: %d entries: \n", theacl->num_aces);
+        for ( i=0; i<theacl->num_aces; i++ ) {
                 verbose_output("    Trustee SID: %s\n", 
-                        sid_string_tos(&acl->aces[i].trustee));
-                if ( sid_equal( &acl->aces[i].trustee, s1 ) ) {
-                        sid_copy( &acl->aces[i].trustee, s2 );
+                        sid_string_tos(&theacl->aces[i].trustee));
+                if ( sid_equal( &theacl->aces[i].trustee, s1 ) ) {
+                        sid_copy( &theacl->aces[i].trustee, s2 );
                         update = True;
                         verbose_output("    New Trustee SID: %s\n", 
-                                sid_string_tos(&acl->aces[i].trustee));
+                                sid_string_tos(&theacl->aces[i].trustee));
                 }
         }

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

@@ -294 +294 @@
         SEC_DESC *sd = NULL;
         SEC_ACE *ace;
-        SEC_ACL *acl;
+        SEC_ACL *theacl;
         int num_ace;
         const char *pacl;
@@ -322 +322 @@
         }
         
-        if ( !(acl = make_sec_acl( mem_ctx, NT4_ACL_REVISION, num_ace, ace )) )
+        if ( !(theacl = make_sec_acl( mem_ctx, NT4_ACL_REVISION, num_ace, ace )) )
                 return NULL;
                 
         sd = make_sec_desc( mem_ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE, 
-                NULL, NULL, NULL, acl, sd_size);
+                NULL, NULL, NULL, theacl, sd_size);
 
         return sd;

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

@@ -195 +195 @@
                 
                 if(chmod(relname, remotestat.st_mode) < 0) {
-                        fprintf(stderr, "Unable to change mode of local dir %s to %o\n", relname, remotestat.st_mode);
+                        fprintf(stderr, "Unable to change mode of local dir %s to %o\n", relname,
+                                (unsigned int)remotestat.st_mode);
                         smbc_closedir(dirhandle);
                         return 0;
@@ -472 +473 @@
         if(keep_permissions && !send_stdout) {
                 if(fchmod(localhandle, remotestat.st_mode) < 0) {
-                        fprintf(stderr, "Unable to change mode of local file %s to %o\n", path, remotestat.st_mode);
+                        fprintf(stderr, "Unable to change mode of local file %s to %o\n", path,
+                                (unsigned int)remotestat.st_mode);
                         smbc_close(remotehandle);
                         close(localhandle);
@@ -488 +490 @@
         char bs[100];
         human_readable(total_bytes, bs, sizeof(bs));
-        if(!quiet)fprintf(stderr, "Downloaded %s in %lu seconds\n", bs, time(NULL) - total_start_time);
+        if(!quiet)fprintf(stderr, "Downloaded %s in %lu seconds\n", bs,
+                (unsigned long)(time(NULL) - total_start_time));
         exit(0);
 }