Changeset 454 for trunk/server/source3/smbd

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

Location:

trunk/server/source3/smbd

Files:

• dosmode.c (modified) (3 diffs)
• password.c (modified) (1 diff)
• reply.c (modified) (2 diffs)
• server.c (modified) (1 diff)
• service.c (modified) (2 diffs)
• sesssetup.c (modified) (1 diff)
• trans2.c (modified) (5 diffs)
• vfs.c (modified) (2 diffs)

trunk/server/source3/smbd/dosmode.c

@@ -180 +180 @@
         if (ro_opts == MAP_READONLY_YES) {
                 /* Original Samba method - map inverse of user "w" bit. */
+#ifndef __OS2__
                 if ((smb_fname->st.st_ex_mode & S_IWUSR) == 0) {
+#else
+                if (os2_isattribute(smb_fname->base_name, aRONLY) == 0) {
+#endif
                         result |= aRONLY;
                 }
@@ -190 +194 @@
         } /* Else never set the readonly bit. */
 
+#ifndef __OS2__
         if (MAP_ARCHIVE(conn) && ((smb_fname->st.st_ex_mode & S_IXUSR) != 0))
+#else
+        if (os2_isattribute(smb_fname->base_name, aARCH) == 0)
+#endif
                 result |= aARCH;
 
+#ifndef __OS2__
         if (MAP_SYSTEM(conn) && ((smb_fname->st.st_ex_mode & S_IXGRP) != 0))
+#else
+        if (os2_isattribute(smb_fname->base_name, aSYSTEM) == 0)
+#endif
                 result |= aSYSTEM;
 
+#ifndef __OS2__
         if (MAP_HIDDEN(conn) && ((smb_fname->st.st_ex_mode & S_IXOTH) != 0))
+#else
+        if (os2_isattribute(smb_fname->base_name, aHIDDEN) == 0)
+#endif
                 result |= aHIDDEN;   
 
@@ -249 +265 @@
 #else
                                 ) {
+#endif
+
+#ifdef __OS2__ //on os2 no error in case of ./.. and errno 2
+        if ((strncmp(smb_fname->base_name, "./..", 4) !=0) || (errno !=2))
 #endif
                         DEBUG(1,("get_ea_dos_attributes: Cannot get attribute "

trunk/server/source3/smbd/password.c

@@ -219 +219 @@
                 return -1;
         }
+
+#ifdef __OS2__
+                        /* On OS/2 we use drive letters which have a colon.  This is also the field
+                           separator in master.passwd, so we use a $ instead of a colon for the drive
+                           separator, ie e$/user instead of e:/user.  This code simply exchanges any $
+                           for a : in the user's homedir */
+                        if (pwd->pw_dir[1] == '$')
+                                        pwd->pw_dir[1] = ':';
+#endif
 
         DEBUG(3, ("Adding homes service for user '%s' using home directory: "

trunk/server/source3/smbd/reply.c

@@ -5652 +5652 @@
         bool dst_exists, old_is_stream, new_is_stream;
 
+/* borrowed from 3.3 source patch by Apple */
+#ifdef __OS2__
+        bool check_dest_exist = False;
+#else
+        bool check_dest_exist = True;
+#endif
+
         status = check_name(conn, smb_fname_dst_in->base_name);
         if (!NT_STATUS_IS_OK(status)) {
@@ -5789 +5796 @@
         dst_exists = SMB_VFS_STAT(conn, smb_fname_dst) == 0;
 
-        if(!replace_if_exists && dst_exists) {
+        if(check_dest_exist && !replace_if_exists && dst_exists) {
                 DEBUG(3, ("rename_internals_fsp: dest exists doing rename "
                           "%s -> %s\n", smb_fname_str_dbg(fsp->fsp_name),

trunk/server/source3/smbd/server.c

@@ -1117 +1117 @@
         reopen_logs();
 
+#ifdef __OS2__
+        unsigned long  _System DosSetPriority (unsigned long  ulScope, unsigned long  ulClass, long lDelta, unsigned long ulID);
+        int rc;
+        rc = DosSetPriority(
+                0,                      /* Scope: only one process */
+                4,             /* set to PRTYC_FOREGROUNDSERVER */
+                0,                      /* set delta - was 0 */
+                0);                     /* Assume current process */
+        DEBUG(0,( "Server priority set to PRTYC_FOREGROUNDSERVER\n"));
+#endif
+
         DEBUG(0,("smbd version %s started.\n", samba_version_string()));
         DEBUGADD(0,("%s\n", COPYRIGHT_STARTUP_MESSAGE));

trunk/server/source3/smbd/service.c

@@ -68 +68 @@
         d = destname;
 
+#ifndef __OS2__
         *d++ = '/'; /* Always start with root. */
 
@@ -159 +160 @@
                 *(d-1) = '\0';
         }
+#else
+        /* Assume OS/2 users are smart enough to put a correct path in smb.conf, and simply copy the string */
+        safe_strcpy(destname, connectpath, strlen(connectpath));
+#endif  
 
         DEBUG(10,("set_conn_connectpath: service %s, connectpath = %s\n",

trunk/server/source3/smbd/sesssetup.c

@@ -75 +75 @@
         result = 0;
 
+#ifndef __OS2__
         tmp = message_push_string(outbuf, "Unix", STR_TERMINATE);
+#else
+        tmp = message_push_string(outbuf, "eCS (OS/2)", STR_TERMINATE);
+#endif
 
         if (tmp == -1) return -1;

trunk/server/source3/smbd/trans2.c

@@ -128 +128 @@
 
         pea->flags = 0;
+#ifndef __OS2__
         if (strnequal(ea_name, "user.", 5)) {
                 pea->name = talloc_strdup(mem_ctx, &ea_name[5]);
         } else {
+#else
+                {
+#endif
                 pea->name = talloc_strdup(mem_ctx, ea_name);
         }
@@ -287 +291 @@
                 fstring dos_ea_name;
 
+#ifndef __OS2__
                 if (strnequal(names[i], "system.", 7)
                     || samba_private_attr_name(names[i]))
+#else
+                if (samba_private_attr_name(names[i]))
+#endif
                         continue;
 
@@ -492 +500 @@
                 fstring unix_ea_name;
 
+#ifdef __OS2__
+                /* All EA's must start with user - except on OS/2 */
+                fstrcpy(unix_ea_name, ea_list->ea.name);
+#else
                 fstrcpy(unix_ea_name, "user."); /* All EA's must start with user. */
                 fstrcat(unix_ea_name, ea_list->ea.name);
+#endif
 
                 canonicalize_ea_name(conn, fsp, fname, unix_ea_name);
@@ -5454 +5467 @@
         }
 
+#ifdef __OS2__
+        /* YD ticket#60, the file is opened, we cannot write to it,
+         * so we can return immediately (see above for more comments).
+         */
+        else {
+#endif
+
         DEBUG(10,("smb_set_file_time: setting utimes to modified values.\n"));
 
@@ -5463 +5483 @@
                 return map_nt_error_from_unix(errno);
         }
+#ifdef __OS2__
+        }
+#endif
 
         notify_fname(conn, NOTIFY_ACTION_MODIFIED, action,

trunk/server/source3/smbd/vfs.c

@@ -716 +716 @@
                 return(0);
 
+#ifdef __OS2__
+        if ((*path == '/' || *path == '\\' || (*path && path[1] == ':')) && strcsequal(LastDir,path))
+#else
         if (*path == '/' && strcsequal(LastDir,path))
+#endif
                 return(0);
 
@@ -938 +942 @@
                   resolved_name));
 
+#ifdef __OS2__
+        if (*resolved_name != '/' && *resolved_name != '\\' && (strlen(resolved_name) <= 1 || resolved_name[1] != ':')) {
+#else
         if (*resolved_name != '/') {
+#endif
                 DEBUG(0,("check_reduced_name: realpath doesn't return "
                          "absolute paths !\n"));