Changeset 773 for branches/samba-3.5.x/source3/smbd

Timestamp:

Jul 2, 2013, 7:27:06 PM (12 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Update branch to 3.5.20

Location:

branches/samba-3.5.x/source3/smbd

Files:

• dosmode.c (modified) (1 diff)
• lanman.c (modified) (9 diffs)
• msdfs.c (modified) (1 diff)
• posix_acls.c (modified) (2 diffs)
• service.c (modified) (4 diffs)
• smb2_tcon.c (modified) (1 diff)

branches/samba-3.5.x/source3/smbd/dosmode.c

@@ -374 +374 @@
                 return False;
         }
+        DEBUG(10,("set_ea_dos_attributes: %d",sizeof(dosattrib)));
 
         ZERO_STRUCT(dosattrib);

branches/samba-3.5.x/source3/smbd/lanman.c

@@ -850 +850 @@
         char *p = skip_string(param,tpscnt,str2);
         char *QueueName = p;
+        fstring share_name;
         unsigned int uLevel;
         int count=0;
@@ -900 +901 @@
         }
 
-        snum = find_service(QueueName);
+        snum = find_service(QueueName, share_name);
         if ( !(lp_snum_ok(snum) && lp_print_ok(snum)) )
                 return False;
@@ -1930 +1931 @@
         int uLevel = get_safe_SVAL(param,tpscnt,p,0,-1);
         int snum;
+        fstring share_name;
 
         if (!str1 || !str2 || !netname || !p) {
@@ -1935 +1937 @@
         }
 
-        snum = find_service(netname);
+        snum = find_service(netname, share_name);
         if (snum < 0) {
                 return False;
@@ -2127 +2129 @@
         }
         pull_ascii_fstring(sharename,data);
-        snum = find_service(sharename);
+        snum = find_service(sharename, sharename);
         if (snum >= 0) { /* already exists */
                 res = ERRfilexists;
@@ -4185 +4187 @@
         print_queue_struct *queue=NULL;
         print_status_struct status;
+        fstring share_name;
 
         if (!str1 || !str2 || !p) {
@@ -4214 +4217 @@
         }
 
-        snum = find_service(name);
+        snum = find_service(name, share_name);
         if ( !(lp_snum_ok(snum) && lp_print_ok(snum)) ) {
                 return False;
@@ -4335 +4338 @@
         char *p = skip_string(param,tpscnt,str2);
         char* PrinterName = p;
+        fstring share_name;
         int uLevel;
         struct pack_desc desc;
@@ -4362 +4366 @@
         }
 
-        snum = find_service(PrinterName);
+        snum = find_service(PrinterName, share_name);
         if ( !(lp_snum_ok(snum) && lp_print_ok(snum)) ) {
                 *rdata_len = 0;

branches/samba-3.5.x/source3/smbd/msdfs.c

@@ -823 +823 @@
         if(snum < 0) {
                 fstring service_name;
-                fstrcpy(service_name, jucn->service_name);
-                if ((snum = find_service(service_name)) < 0) {
+                if ((snum = find_service(jucn->service_name, service_name)) < 0) {
                         return NT_STATUS_NOT_FOUND;
                 }

branches/samba-3.5.x/source3/smbd/posix_acls.c

@@ -1360 +1360 @@
                 if (pace->type == SMB_ACL_USER_OBJ) {
 
-                        if (setting_acl && !is_default_acl) {
+                        if (setting_acl) {
+                                /*
+                                 * Ensure we have default parameters for the
+                                 * user (owner) even on default ACLs.
+                                 */
                                 apply_default_perms(params, is_directory, pace, S_IRUSR);
                         }
@@ -1440 +1444 @@
                         }
 
-                        if (!is_default_acl) {
-                                apply_default_perms(params, is_directory, pace, S_IRUSR);
-                        }
+                        /*
+                         * Ensure we have default parameters for the
+                         * user (owner) even on default ACLs.
+                         */
+                        apply_default_perms(params, is_directory, pace, S_IRUSR);
                 } else {
                         pace->perms = unix_perms_to_acl_perms(pst->st_ex_mode, S_IRUSR, S_IWUSR, S_IXUSR);

branches/samba-3.5.x/source3/smbd/service.c

@@ -306 +306 @@
  * Find a service entry.
  *
- * @param service is modified (to canonical form??)
+ * @param service_in is modified (to canonical form??)
+ * and returned in return parameter service.
  **/
 
-int find_service(fstring service)
+int find_service(const char *service_in, fstring service)
 {
         int iService;
         struct smbd_server_connection *sconn = smbd_server_conn;
 
+        if (!service_in) {
+                return -1;
+        }
+
+        fstrcpy(service, service_in);
         all_string_sub(service,"\\","/",0);
 
@@ -400 +406 @@
                         }
 
-                        iService = find_service(defservice);
+                        iService = find_service(defservice, service);
                         if (iService >= 0) {
                                 all_string_sub(service, "_","/",0);
@@ -1183 +1189 @@
                                         current_user_info.smb_name);
                                 map_username(sconn, unix_username);
-                                snum = find_service(unix_username);
+                                snum = find_service(unix_username, unix_username);
                         } 
                         if (snum != -1) {
@@ -1211 +1217 @@
         strlower_m(service);
 
-        snum = find_service(service);
+        snum = find_service(service, service);
 
         if (snum < 0) {

branches/samba-3.5.x/source3/smbd/smb2_tcon.c

@@ -168 +168 @@
         strlower_m(service);
 
-        snum = find_service(service);
+        snum = find_service(service, service);
         if (snum < 0) {
                 DEBUG(3,("smbd_smb2_tree_connect: couldn't find service %s\n",