Changeset 235 for branches/samba-3.2.x/source

Timestamp:

May 27, 2009, 12:08:58 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.11

Location:

branches/samba-3.2.x/source

Files:

• VERSION (modified) (1 diff)
• include/rpc_secdes.h (modified) (2 diffs)
• include/version.h (modified) (1 diff)
• lib/smbconf/smbconf_reg.c (modified) (1 diff)
• libgpo/gpo_ldap.c (modified) (1 diff)
• libsmb/cliconnect.c (modified) (1 diff)
• param/loadparm.c (modified) (3 diffs)
• passdb/pdb_tdb.c (modified) (3 diffs)
• popt/popt.h (modified) (1 diff)
• rpc_server/srv_lsa_nt.c (modified) (1 diff)
• rpc_server/srv_samr_nt.c (modified) (4 diffs)
• smbd/ipc.c (modified) (2 diffs)
• smbd/notify.c (modified) (1 diff)
• smbd/open.c (modified) (2 diffs)
• utils/net_rpc.c (modified) (1 diff)
• utils/smbpasswd.c (modified) (1 diff)

branches/samba-3.2.x/source/VERSION

@@ -26 +26 @@
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=2
-SAMBA_VERSION_RELEASE=10
+SAMBA_VERSION_RELEASE=11
 
 ########################################################

branches/samba-3.2.x/source/include/rpc_secdes.h

@@ -225 +225 @@
 #define SA_RIGHT_SAM_CREATE_DOMAIN      0x00000008
 #define SA_RIGHT_SAM_ENUM_DOMAINS       0x00000010
-#define SA_RIGHT_SAM_OPEN_DOMAIN        0x00000020
+#define SA_RIGHT_SAM_LOOKUP_DOMAIN      0x00000020
 
 #define SA_RIGHT_SAM_ALL_ACCESS         0x0000003F
@@ -245 +245 @@
 #define GENERIC_RIGHTS_SAM_EXECUTE \
                 (STANDARD_RIGHTS_EXECUTE_ACCESS | \
-                SA_RIGHT_SAM_OPEN_DOMAIN        | \
+                SA_RIGHT_SAM_LOOKUP_DOMAIN      | \
                 SA_RIGHT_SAM_CONNECT_SERVER)            
 

branches/samba-3.2.x/source/include/version.h

@@ -2 +2 @@
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 2
-#define SAMBA_VERSION_RELEASE 10
-#define SAMBA_VERSION_OFFICIAL_STRING "3.2.10"
+#define SAMBA_VERSION_RELEASE 11
+#define SAMBA_VERSION_OFFICIAL_STRING "3.2.11"
 #define SAMBA_VERSION_STRING samba_version_string()

branches/samba-3.2.x/source/lib/smbconf/smbconf_reg.c

@@ -266 +266 @@
             lp_parameter_is_global(valname))
         {
-                DEBUG(5, ("Global paramter '%s' not allowed in "
+                DEBUG(5, ("Global parameter '%s' not allowed in "
                           "service definition ('%s').\n", canon_valname,
                           subkeyname));

branches/samba-3.2.x/source/libgpo/gpo_ldap.c

@@ -454 +454 @@
 
 /****************************************************************
- get a GROUP_POLICY_OBJECT structure based on different input paramters
+ get a GROUP_POLICY_OBJECT structure based on different input parameters
 ****************************************************************/
 

branches/samba-3.2.x/source/libsmb/cliconnect.c

@@ -1097 +1097 @@
         }
 
-        cli->cnum = -1;
+        cli->vuid = -1;
         return True;
 }

branches/samba-3.2.x/source/param/loadparm.c

@@ -864 +864 @@
 /* Note: We do not initialise the defaults union - it is not allowed in ANSI C
  *
- * The FLAG_HIDE is explicit. Paramters set this way do NOT appear in any edit
+ * The FLAG_HIDE is explicit. Parameters set this way do NOT appear in any edit
  * screen in SWAT. This is used to exclude parameters as well as to squash all
  * parameters that have been duplicated by pseudonyms.
@@ -873 +873 @@
  *        respective views.
  *
- * NOTE2: Handling of duplicated (synonym) paramters:
+ * NOTE2: Handling of duplicated (synonym) parameters:
  *      Only the first occurance of a parameter should be enabled by FLAG_BASIC
  *      and/or FLAG_ADVANCED. All duplicates following the first mention should be
@@ -4535 +4535 @@
                 string_set(&pService->szLprmcommand, "vlp lprm %p %j");
                 string_set(&pService->szLppausecommand, "vlp lppause %p %j");
-                string_set(&pService->szLpresumecommand, "vlp lpresum %p %j");
+                string_set(&pService->szLpresumecommand, "vlp lpresume %p %j");
                 string_set(&pService->szQueuepausecommand, "vlp queuepause %p");
                 string_set(&pService->szQueueresumecommand, "vlp queueresume %p");

branches/samba-3.2.x/source/passdb/pdb_tdb.c

@@ -1407 +1407 @@
                            int flag)
 {
-        if (!pdb_get_user_rid(newpwd)) {
+        uint32_t oldrid;
+        uint32_t newrid;
+
+        if (!(newrid = pdb_get_user_rid(newpwd))) {
                 DEBUG(0,("tdb_update_sam: struct samu (%s) with no RID!\n",
                          pdb_get_username(newpwd)));
@@ -1413 +1416 @@
         }
 
+        oldrid = newrid;
+
         /* open the database */
 
@@ -1425 +1430 @@
         }
 
-        if (!tdb_update_samacct_only(newpwd, flag)
-            || !tdb_update_ridrec_only(newpwd, flag)) {
+        /* If we are updating, we may be changing this users RID. Retrieve the old RID
+           so we can check. */
+
+        if (flag == TDB_MODIFY) {
+                struct samu *account = samu_new(talloc_tos());
+                if (account == NULL) {
+                        DEBUG(0,("tdb_update_sam: samu_new() failed\n"));
+                        goto cancel;
+                }
+                if (!NT_STATUS_IS_OK(tdbsam_getsampwnam(my_methods, account, pdb_get_username(newpwd)))) {
+                        DEBUG(0,("tdb_update_sam: tdbsam_getsampwnam() for %s failed\n",
+                                pdb_get_username(newpwd)));
+                        TALLOC_FREE(account);
+                        goto cancel;
+                }
+                if (!(oldrid = pdb_get_user_rid(account))) {
+                        DEBUG(0,("tdb_update_sam: pdb_get_user_rid() failed\n"));
+                        TALLOC_FREE(account);
+                        goto cancel;
+                }
+                TALLOC_FREE(account);
+        }
+
+        /* Update the new samu entry. */
+        if (!tdb_update_samacct_only(newpwd, flag)) {
                 goto cancel;
+        }
+
+        /* Now take care of the case where the RID changed. We need
+         * to delete the old RID key and add the new. */
+
+        if (flag == TDB_MODIFY && newrid != oldrid) { 
+                fstring keystr;
+
+                /* Delete old RID key */
+                DEBUG(10, ("tdb_update_sam: Deleting key for RID %u\n", oldrid));
+                slprintf(keystr, sizeof(keystr) - 1, "%s%.8x", RIDPREFIX, oldrid);
+                if (!NT_STATUS_IS_OK(dbwrap_delete_bystring(db_sam, keystr))) {
+                        DEBUG(0, ("tdb_update_sam: Can't delete %s\n", keystr));
+                        goto cancel;
+                }
+                /* Insert new RID key */
+                DEBUG(10, ("tdb_update_sam: Inserting key for RID %u\n", newrid));
+                if (!tdb_update_ridrec_only(newpwd, TDB_INSERT)) {
+                        goto cancel;
+                }
+        } else {
+                DEBUG(10, ("tdb_update_sam: %s key for RID %u\n",
+                        flag == TDB_MODIFY ? "Updating" : "Inserting", newrid));
+                if (!tdb_update_ridrec_only(newpwd, flag)) {
+                        goto cancel;
+                }
         }
 

branches/samba-3.2.x/source/popt/popt.h

@@ -84 +84 @@
 #define POPT_ERROR_BADOPT       -11     /*!< unknown option */
 #define POPT_ERROR_OPTSTOODEEP  -13     /*!< aliases nested too deeply */
-#define POPT_ERROR_BADQUOTE     -15     /*!< error in paramter quoting */
+#define POPT_ERROR_BADQUOTE     -15     /*!< error in parameter quoting */
 #define POPT_ERROR_ERRNO        -16     /*!< errno set, use strerror(errno) */
 #define POPT_ERROR_BADNUMBER    -17     /*!< invalid numeric value */

branches/samba-3.2.x/source/rpc_server/srv_lsa_nt.c

@@ -831 +831 @@
                                            &mapped_count);
 
-        if (NT_STATUS_IS_ERR(status)) {
+        /* Only return here when there is a real error.
+           NT_STATUS_NONE_MAPPED is a special case as it indicates that none of
+           the requested sids could be resolved. Older versions of XP (pre SP3)
+           rely that we return with the string representations of those SIDs in
+           that case. If we don't, XP crashes - Guenther
+           */
+
+        if (NT_STATUS_IS_ERR(status) &&
+            !NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
                 return status;
         }

branches/samba-3.2.x/source/rpc_server/srv_samr_nt.c

@@ -621 +621 @@
                 return NT_STATUS_INVALID_HANDLE;
 
-        status = access_check_samr_function(info->acc_granted,
-                                            SA_RIGHT_SAM_OPEN_DOMAIN,
-                                            "_samr_OpenDomain" );
-
-        if ( !NT_STATUS_IS_OK(status) )
-                return status;
-
         /*check if access can be granted as requested by client. */
         map_max_allowed_access(p->pipe_user.nt_user_token, &des_access);
@@ -2958 +2951 @@
 
         status = access_check_samr_function(info->acc_granted,
-                                            SA_RIGHT_SAM_OPEN_DOMAIN,
+                                            SA_RIGHT_SAM_LOOKUP_DOMAIN,
                                             "_samr_QueryDomainInfo" );
 
@@ -3358 +3351 @@
 
         se_map_generic( &des_access, &sam_generic_mapping );
-        info->acc_granted = des_access & (SA_RIGHT_SAM_ENUM_DOMAINS|SA_RIGHT_SAM_OPEN_DOMAIN);
+        info->acc_granted = des_access & (SA_RIGHT_SAM_ENUM_DOMAINS|SA_RIGHT_SAM_LOOKUP_DOMAIN);
 
         /* get a (unique) handle.  open a policy on it. */
@@ -3545 +3538 @@
 
         status = access_check_samr_function(info->acc_granted,
-                                            SA_RIGHT_SAM_OPEN_DOMAIN,
+                                            SA_RIGHT_SAM_LOOKUP_DOMAIN,
                                             "_samr_LookupDomain");
         if (!NT_STATUS_IS_OK(status)) {

branches/samba-3.2.x/source/smbd/ipc.c

@@ -659 +659 @@
         }
 
+        talloc_steal(talloc_tos(), state);
+
         handle_trans(conn, req, state);
 
@@ -788 +790 @@
         SCVAL(req->inbuf,smb_com,SMBtrans);
 
+        talloc_steal(talloc_tos(), state);
+
         handle_trans(conn, req, state);
 

branches/samba-3.2.x/source/smbd/notify.c

@@ -232 +232 @@
                      fsp->fsp_name) == -1) {
                 DEBUG(0, ("asprintf failed\n"));
+                TALLOC_FREE(fsp->notify);
                 return NT_STATUS_NO_MEMORY;
         }

branches/samba-3.2.x/source/smbd/open.c

@@ -3056 +3056 @@
                   ea_list, sd, fname));
 
+        /* MSDFS pathname processing must be done FIRST.
+           MSDFS pathnames containing IPv6 addresses can
+           be confused with NTFS stream names (they contain
+           ":" characters. JRA. */
+
+        if ((req != NULL) && (req->flags2 & FLAGS2_DFS_PATHNAMES)) {
+                char *resolved_fname;
+
+                status = resolve_dfspath(talloc_tos(), conn, true, fname,
+                                         &resolved_fname);
+
+                if (!NT_STATUS_IS_OK(status)) {
+                        /*
+                         * For PATH_NOT_COVERED we had
+                         * reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
+                         *                 ERRSRV, ERRbadpath);
+                         * Need to fix in callers
+                         */
+                        goto fail;
+                }
+                fname = resolved_fname;
+        }
+
         /*
          * Get the file name.
@@ -3183 +3206 @@
         }
 
-        if ((req != NULL) && (req->flags2 & FLAGS2_DFS_PATHNAMES)) {
-                char *resolved_fname;
-
-                status = resolve_dfspath(talloc_tos(), conn, true, fname,
-                                         &resolved_fname);
-
-                if (!NT_STATUS_IS_OK(status)) {
-                        /*
-                         * For PATH_NOT_COVERED we had
-                         * reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
-                         *                 ERRSRV, ERRbadpath);
-                         * Need to fix in callers
-                         */
-                        goto fail;
-                }
-                fname = resolved_fname;
-        }
-
         /*
          * Check if POSIX semantics are wanted.

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

@@ -6281 +6281 @@
         nt_status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
                                          pipe_hnd->cli->desthost,
-                                         SA_RIGHT_SAM_OPEN_DOMAIN,
+                                         SA_RIGHT_SAM_LOOKUP_DOMAIN,
                                          &connect_hnd);
         if (!NT_STATUS_IS_OK(nt_status)) {

branches/samba-3.2.x/source/utils/smbpasswd.c

@@ -431 +431 @@
                 
                 if((local_flags & LOCAL_SET_PASSWORD) && (new_passwd == NULL)) {
-                        struct passwd *passwd = getpwnam_alloc(NULL, user_name);
-
-                        if (!passwd) {
-                                fprintf(stderr, "Cannot locate Unix account for "
-                                        "'%s'!\n", user_name);
-                                exit(1);
+                        struct passwd *passwd;
+
+                        if (remote_machine == NULL) {
+                                passwd = getpwnam_alloc(NULL, user_name);
+
+                                if (!passwd) {
+                                        fprintf(stderr, "Cannot locate Unix account for "
+                                                "'%s'!\n", user_name);
+                                        exit(1);
+                                }
+                                TALLOC_FREE(passwd);
                         }
-                        TALLOC_FREE(passwd);
 
                         new_passwd = prompt_for_new_password(stdin_passwd_get);