Changeset 257

Timestamp:

Jun 9, 2009, 12:08:29 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

printing.c:start_background_queue loop fix in 3.2 branch

Location:

branches/samba-3.2.x/source

Files:

• printing/printing.c (modified) (1 diff)
• smbd/password.c (modified) (1 diff)

branches/samba-3.2.x/source/printing/printing.c

@@ -1403 +1403 @@
         DEBUG(3,("start_background_queue: Starting background LPQ thread\n"));
 
+#ifndef __OS2__
         if (pipe(pause_pipe) == -1) {
+#else
+        // on OS2 we have no select() on pipes, so we use socketpair() instead
+        if (socketpair(AF_UNIX, SOCK_STREAM,0, pause_pipe) < 0) {
+#endif
                 DEBUG(5,("start_background_queue: cannot create pipe. %s\n", strerror(errno) ));
                 exit(1);

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

@@ -346 +346 @@
 
         vuser->homes_snum = -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 (vuser->unix_homedir[1] == '$')
+                vuser->unix_homedir[1] = ':';
+#endif
+
         if ( (!vuser->guest) && vuser->unix_homedir && *(vuser->unix_homedir)) {
                 int servicenumber = lp_servicenumber(vuser->user.unix_name);