Changeset 454

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

Files:

• Makefile.in (modified) (8 diffs)
• build.cmd (added)
• build.options (added)
• dynconfig.c (modified) (3 diffs)
• groupdb/mapping_ldb.c (modified) (1 diff)
• include/g_lock.h (added)
• include/version.h (modified) (1 diff)
• lib/charcnv.c (modified) (1 diff)
• lib/fault.c (modified) (4 diffs)
• lib/g_lock.c (added)
• lib/iconv.c (modified) (4 diffs)
• lib/ldb/common/ldb.c (modified) (1 diff)
• lib/ldb/ldb_tdb/ldb_tdb.c (modified) (1 diff)
• lib/os2ea.c (added)
• lib/os2path.c (added)
• lib/pidfile.c (modified) (4 diffs)
• lib/readline.c (modified) (1 diff)
• lib/select.c (modified) (1 diff)
• lib/smbrun.c (modified) (2 diffs)
• lib/system.c (modified) (13 diffs)
• lib/system_smbd.c (modified) (2 diffs)
• lib/util.c (modified) (1 diff)
• lib/util_sec.c (modified) (4 diffs)
• lib/util_sock.c (modified) (3 diffs)
• lib/util_str.c (modified) (1 diff)
• libaddns/dns.h (modified) (1 diff)
• libaddns/dnserr.h (modified) (1 diff)
• libsmb/clientgen.c (modified) (2 diffs)
• libsmb/clifile.c (modified) (2 diffs)
• locking/posix.c (modified) (2 diffs)
• nmbd/asyncdns.c (modified) (1 diff)
• nmbd/nmbd.c (modified) (3 diffs)
• nmbd/nmbd_serverlistdb.c (modified) (2 diffs)
• nmbd/nmbd_winsserver.c (modified) (1 diff)
• param/loadparm.c (modified) (2 diffs)
• passdb/pdb_smbpasswd.c (modified) (6 diffs)
• printing/printing.c (modified) (1 diff)
• rpc_server/srv_srvsvc_nt.c (modified) (6 diffs)
• smbd/dosmode.c (modified) (3 diffs)
• smbd/password.c (modified) (1 diff)
• smbd/reply.c (modified) (2 diffs)
• smbd/server.c (modified) (1 diff)
• smbd/service.c (modified) (2 diffs)
• smbd/sesssetup.c (modified) (1 diff)
• smbd/trans2.c (modified) (5 diffs)
• smbd/vfs.c (modified) (2 diffs)
• torture/torture.c (modified) (2 diffs)
• utils/net_g_lock.c (added)
• utils/net_usershare.c (modified) (2 diffs)
• utils/net_util.c (modified) (1 diff)
• version.ec_ (added)
• web/cgi.c (modified) (2 diffs)
• web/startstop.c (modified) (10 diffs)
• web/swat.c (modified) (1 diff)

trunk/server/source3/Makefile.in

@@ -391 +391 @@
           $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
           lib/interface.o lib/pidfile.o \
-          lib/system.o lib/sendfile.o lib/recvfile.o lib/time.o \
+          lib/system.o lib/os2ea.o lib/os2path.o lib/sendfile.o lib/recvfile.o lib/time.o \
           lib/username.o \
           ../libds/common/flag_mapping.o \
@@ -1785 +1785 @@
                 $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS)
 
-bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/ldbedit@EXEEXT@: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
         @echo Linking $@
         @$(CC) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \
@@ -1791 +1791 @@
                 $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/ldbsearch@EXEEXT@: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
         @echo Linking $@
         @$(CC) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) \
@@ -1797 +1797 @@
                 $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/ldbadd@EXEEXT@: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
         @echo Linking $@
         @$(CC) -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) \
@@ -1803 +1803 @@
                 $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/ldbmodify@EXEEXT@: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
         @echo Linking $@
         @$(CC) -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) \
@@ -1809 +1809 @@
                 $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/ldbdel@EXEEXT@: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
         @echo Linking $@
         @$(CC) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) \
@@ -1815 +1815 @@
                 $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/ldbrename@EXEEXT@: $(BINARY_PREREQS) $(LDBRENAME_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
         @echo Linking $@
         @$(CC) $(FLAGS) -o $@ $(LDBRENAME_OBJ) $(DYNEXP) $(LDFLAGS) \
@@ -1821 +1821 @@
                 $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/versiontest: $(BINARY_PREREQS) lib/version_test.o $(VERSION_OBJ)
+bin/versiontest@EXEEXT@: $(BINARY_PREREQS) lib/version_test.o $(VERSION_OBJ)
         @echo Linking $@
         @$(CC) $(FLAGS) -o $@ $(VERSION_OBJ) lib/version_test.o

trunk/server/source3/dynconfig.c

@@ -41 +41 @@
  **/
 
+#ifndef __OS2__
 #define DEFINE_DYN_CONFIG_PARAM(name) \
 static char *dyn_##name; \
@@ -65 +66 @@
         return (dyn_##name == NULL);\
 }
+#else
+#define DEFINE_DYN_CONFIG_PARAM(name) \
+static char *dyn_##name; \
+\
+ const char *set_dyn_##name(const char *newpath) \
+{\
+        if (dyn_##name) {\
+                SAFE_FREE(dyn_##name);\
+        }\
+        dyn_##name = SMB_STRDUP(newpath);\
+        return dyn_##name;\
+}\
+\
+ bool is_default_dyn_##name(void) \
+{\
+        return (dyn_##name == NULL);\
+}
+#endif
 
 DEFINE_DYN_CONFIG_PARAM(SBINDIR)
@@ -83 +102 @@
 DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
 DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)
+
+#ifdef __OS2__
+
+/* Directory the binary was called from, same as getbindir() */
+const char *get_dyn_SBINDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", SBINDIR);
+                } else {
+                        snprintf(buffer, 260, "%s", exedir);
+                }
+        }
+
+        if (dyn_SBINDIR == NULL) {
+                return buffer;
+        }
+        return dyn_SBINDIR;
+}
+
+/* Directory the binary was called from, same as getsbindir() */
+const char *get_dyn_BINDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", BINDIR);
+                } else {
+                        snprintf(buffer, 260, "%s", exedir);
+                }
+        }
+
+        if (dyn_BINDIR == NULL) {
+                return buffer;
+        }
+        return dyn_BINDIR;
+}
+
+/* Directory holding the SWAT files */
+const char *get_dyn_SWATDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", SWATDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir,"swat");
+                }
+        }
+
+        if (dyn_SWATDIR == NULL) {
+                return buffer;
+        }
+        return dyn_SWATDIR;
+}
+
+/* Location of smb.conf file. */
+const char *get_dyn_CONFIGFILE(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/smb.conf", getenv("ETC"));
+        }
+        /* Set UNIXROOT to x:\MPTN if UNIXROOT is undefined */
+        if (getenv("UNIXROOT") == NULL) {
+                static char unixroot[1024] = "";
+                strncpy(unixroot,getenv("ETC"),strlen(getenv("ETC"))-4);
+                setenv("UNIXROOT",unixroot,0);
+        }
+        /* Make sure TMPIR points to a proper value */
+        static char tmpdir[1024] = "";
+        if (getenv("TMPDIR") == NULL && getenv("TEMP") != NULL) {
+                strncpy(tmpdir,getenv("TEMP"),strlen(getenv("TEMP")));
+                setenv("TMPDIR",tmpdir,0);
+        }
+        if (getenv("TMPDIR") == NULL) {
+                strncpy(tmpdir,getenv("ETC"),2);
+                stpcpy(tmpdir,"/OS2/SYSTEM");
+                setenv("TMPDIR",tmpdir,0);
+        }
+
+        if (dyn_CONFIGFILE == NULL) {
+                return buffer;
+        }
+        return dyn_CONFIGFILE;
+}
+
+/** Log file directory. **/
+const char *get_dyn_LOGFILEBASE(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/log", getenv("ETC"));
+        }
+        if (dyn_LOGFILEBASE == NULL) {
+                return buffer;
+        }
+        return dyn_LOGFILEBASE;
+}
+
+/** Statically configured LanMan hosts. **/
+const char *get_dyn_LMHOSTSFILE(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/lmhosts", getenv("ETC"));
+        }
+        if (dyn_LMHOSTSFILE == NULL) {
+                return buffer;
+        }
+        return dyn_LMHOSTSFILE;
+}
+
+/* Directory holding the codepages */
+const char *get_dyn_CODEPAGEDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", CODEPAGEDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "codepages");
+                }
+        }
+
+        if (dyn_CODEPAGEDIR == NULL) {
+                return buffer;
+        }
+        return dyn_CODEPAGEDIR;
+}
+
+/* Directory holding the libs */
+const char *get_dyn_LIBDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", LIBDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
+                }
+        }
+
+        if (dyn_LIBDIR == NULL) {
+                return buffer;
+        }
+        return dyn_LIBDIR;
+}
+
+/* Directory holding the modules */
+const char *get_dyn_MODULESDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", MODULESDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "modules");
+                }
+        }
+
+        if (dyn_MODULESDIR == NULL) {
+                return buffer;
+        }
+        return dyn_MODULESDIR;
+}
+
+/* Directory holding lock files */
+const char *get_dyn_LOCKDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/lock", getenv("ETC"));
+        }
+        if (dyn_LOCKDIR == NULL) {
+                return buffer;
+        }
+        return dyn_LOCKDIR;
+}
+
+/* Directory holding the pid files */
+const char *get_dyn_PIDDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/pid", getenv("ETC"));
+        }
+        if (dyn_PIDDIR == NULL) {
+                return buffer;
+        }
+        return dyn_PIDDIR;
+}
+
+/* Location of smbpasswd */
+const char *get_dyn_SMB_PASSWD_FILE(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/private/smbpasswd", getenv("ETC"));
+        }
+        if (dyn_SMB_PASSWD_FILE == NULL) {
+                return buffer;
+        }
+        return dyn_SMB_PASSWD_FILE;
+}
+
+/* Directory holding the private files */
+const char *get_dyn_PRIVATE_DIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                snprintf(buffer, 260, "%s/samba/private", getenv("ETC"));
+        }
+        if (dyn_PRIVATE_DIR == NULL) {
+                return buffer;
+        }
+        return dyn_PRIVATE_DIR;
+}
+
+/* @todo define NCALRPCDIR and SHLIBDIR eventually different */
+
+/* Directory holding the shared libs (same as libdir) */
+const char *get_dyn_SHLIBEXT(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", LIBDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
+                }
+        }
+
+        if (dyn_SHLIBEXT == NULL) {
+                return buffer;
+        }
+        return dyn_SHLIBEXT;
+}
+
+/* Directory holding the NCALRPCDIR (whatever that is) */
+const char *get_dyn_NCALRPCDIR(void)
+{
+        static char buffer[1024] = "";
+        if (!*buffer)
+        {
+                char exedir[1024] = "";
+                if (os2_GetExePath(exedir) != 0)
+                {
+                        snprintf(buffer, 260, "%s", NCALRPCDIR);
+                } else {
+                        snprintf(buffer, 260, "%s/%s", exedir, "lib");
+                }
+        }
+
+        if (dyn_NCALRPCDIR == NULL) {
+                return buffer;
+        }
+        return dyn_NCALRPCDIR;
+}
+
+#endif /* __OS2__ */
+
+/* In non-FHS mode, these should be configurable using 'lock dir =';
+   but in FHS mode, they are their own directory.  Implement as wrapper
+   functions so that everything can still be kept in dynconfig.c.
+ */
+
+const char *get_dyn_STATEDIR(void)
+{
+#ifdef FHS_COMPATIBLE
+        return STATEDIR;
+#else
+        return lp_lockdir();
+#endif
+}
+
+const char *get_dyn_CACHEDIR(void)
+{
+#ifdef FHS_COMPATIBLE
+        return CACHEDIR;
+#else
+        return lp_lockdir();
+#endif
+}

trunk/server/source3/groupdb/mapping_ldb.c

@@ -81 +81 @@
         /* force the permissions on the ldb to 0600 - this will fix
            existing databases as well as new ones */
+#ifndef __OS2__
         if (chmod(db_path, 0600) != 0) {
                 goto failed;
         }
+#endif
 
         if (!existed) {

trunk/server/source3/include/version.h

@@ -4 +4 @@
 #define SAMBA_VERSION_RELEASE 2
 #define SAMBA_VERSION_OFFICIAL_STRING "3.5.2"
+#define SAMBA_VERSION_VENDOR_SUFFIX "eCS 1.2.0"
+#define SAMBA_VERSION_VENDOR_PATCH 426
+#define SAMBA_VERSION_VENDOR_PATCH_STRING "426"
 #ifdef SAMBA_VERSION_VENDOR_FUNCTION
 #  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION

trunk/server/source3/lib/charcnv.c

@@ -1804 +1804 @@
 */
 
+/* @todo eventually port old code, but probably not necessary */
 codepoint_t next_codepoint(const char *str, size_t *size)
 {

trunk/server/source3/lib/fault.c

@@ -54 +54 @@
         if (cont_fn) {
                 cont_fn(NULL);
+#ifndef __OS2__ /* don't use the built in signal capture stuff - prefer native handling of errors */
 #ifdef SIGSEGV
                 CatchSignal(SIGSEGV,SIGNAL_CAST SIG_DFL);
@@ -62 +63 @@
 #ifdef SIGABRT
                 CatchSignal(SIGABRT,SIGNAL_CAST SIG_DFL);
+#endif
 #endif
                 return; /* this should cause a core dump */
@@ -83 +85 @@
         cont_fn = fn;
 
+#ifndef __OS2__ /* don't use the built in signal capture stuff - prefer native handling of errors */
 #ifdef SIGSEGV
         CatchSignal(SIGSEGV,SIGNAL_CAST sig_fault);
@@ -91 +94 @@
 #ifdef SIGABRT
         CatchSignal(SIGABRT,SIGNAL_CAST sig_fault);
+#endif
 #endif
 }

trunk/server/source3/lib/iconv.c

@@ -128 +128 @@
 }
 
+#ifdef __OS2__
+// i could have done a static variable w/o this function. but i feel it's nicer this way.
+// the purpose of this function is to save the to_name to get the korean and japanese code set working 
+char * save_toname(char *toname, bool what)
+{
+   static char *to_name=NULL;
+
+   if ( what == 0 )
+        to_name = SMB_STRDUP(toname);
+
+        return to_name;
+}
+#endif
+
 #ifdef HAVE_NATIVE_ICONV
 /* if there was an error then reset the internal state,
@@ -136 +150 @@
                         char **outbuf, size_t *outbytesleft)
 {
+#ifdef __OS2__
+        uint16 *outbuf_uc = ( uint16 * )*outbuf;
+        char *to_name = save_toname(NULL, 1);
+#endif
+
         size_t ret = iconv((iconv_t)cd, 
                            (void *)inbuf, inbytesleft,
@@ -144 +163 @@
                 errno = saved_errno;
         }
+#ifdef __OS2__
+        /* Workaround for path separator on OS/2 */
+        else
+        {
+                if( (strstr(to_name, "949") != NULL) ||     /* Korean CP */
+                   (strstr(to_name, "932") != NULL) ||      /* Japanese CP */
+                   (strstr(to_name, "942") != NULL) ||      /* Japanese CP */
+                   (strstr(to_name, "943") != NULL) )       /* Japanese CP */
+                {
+                         while(( char * )outbuf_uc < *outbuf )
+                        {
+                            if( *outbuf_uc == 0x20a9 ||     /* Korean WON */
+                                *outbuf_uc == 0x00a5 )      /* Japanese YEN */
+                                *outbuf_uc = '\\';
+
+                            outbuf_uc++;
+                        }
+                }
+        }
+#endif
+
         return ret;
 }
@@ -161 +201 @@
         char *bufp = cvtbuf;
         size_t bufsize;
+#ifdef __OS2__
+        save_toname(cd->to_name, 0);
+#endif
 
         /* in many cases we can go direct */

trunk/server/source3/lib/ldb/common/ldb.c

@@ -117 +117 @@
         ldb_connect_fn fn;
 
+#ifndef __OS2__ //  on OS2 we have a semicolon at the second character if w/o backend called
         if (strchr(url, ':') != NULL) {
+#else
+        if (url[1] != ':'  &&  strchr(url, ':') != NULL) {
+#endif
                 backend = talloc_strndup(ldb, url, strchr(url, ':')-url);
         } else {

trunk/server/source3/lib/ldb/ldb_tdb/ldb_tdb.c

@@ -1012 +1012 @@
 
         /* parse the url */
+#ifndef __OS2__ //  on OS2 we have a semicolon at the second character if w/o backend called
         if (strchr(url, ':')) {
+#else
+        if (url[1] != ':'  &&  strchr(url, ':') != NULL) {
+#endif
                 if (strncmp(url, "tdb://", 6) != 0) {
                         ldb_debug(ldb, LDB_DEBUG_ERROR, "Invalid tdb URL '%s'", url);

trunk/server/source3/lib/pidfile.c

@@ -68 +68 @@
         }
 
+#ifndef __OS2__ // if we lock the file, we won't be able to read it later on OS/2
         if (fcntl_lock(fd,SMB_F_SETLK,0,1,F_RDLCK)) {
                 /* we could get the lock - it can't be a Samba process */
                 goto noproc;
         }
+#endif
 
         SAFE_FREE(pidFile);
@@ -95 +97 @@
         /* Add a suffix to the program name if this is a process with a
          * none default configuration file name. */
+
+        /* On OS/2, CONFIGFILE will always be different to dyn_CONFIGFILE 
+           as dyn_CONFIGFILE dynamically looks up the system ETC directory */    
+#ifndef __OS2__
+
         if (strcmp( CONFIGFILE, get_dyn_CONFIGFILE()) == 0) {
                 name = SMB_STRDUP(program_name);
@@ -111 +118 @@
                 }
         }
+#else
+        name = SMB_STRDUP(program_name);
+#endif
 
         if (asprintf(&pidFile_name, "%s/%s.pid", lp_piddir(), name) == -1) {
@@ -144 +154 @@
                 exit(1);
         }
+
         /* Leave pid file open & locked for the duration... */
         SAFE_FREE(name);
+#ifdef __OS2__ // If we leave the file open & locked on OS/2 - we can't read it, so close the fd
+        close(fd);
+#endif
 }
 

trunk/server/source3/lib/readline.c

@@ -102 +102 @@
                         return ret;
                 }
+#ifdef __OS2__
+#include <conio.h>
+                {
+                        char * cp = line;
+                        char c;
+                        int flag = 1;
+                        while (flag && cp < line + sizeof(line) - 1) 
+                        {
+                                c = getch();
+                                switch (c) 
+                                {
+                                        case 8:
+                                        {
+                                                if (cp > line) 
+                                                {
+                                                        cp--;
+                                                        putchar(8);
+                                                        putchar(32);
+                                                        putchar(8);
+                                                }
+                                        } break;
+                                        case 0: break;
+                                        case 10: // generally should not be
+                                        case 13:
+                                        {
+                                                flag = 0;
+                                        } break;
+                                        case 27: 
+                                        {
+                                                for (; cp > line; cp--) 
+                                                {
+                                                        putchar(8);
+                                                        putchar(32);
+                                                        putchar(8);
+                                                }
+                                        } break;
+                                        default:
+                                        {
+                                                *cp++ = c;
+                                                putchar(c);
+                                        }
+                                }
+                        }
+                        *cp = 0;
+                        printf("\n");
+                        return line;
+                }
+#endif /* __OS2__ */
+
                 if (callback) {
                         callback();

trunk/server/source3/lib/select.c

@@ -63 +63 @@
 
         if (initialised != sys_getpid()) {
+#ifndef __OS2__
                 if (pipe(select_pipe) == -1)
+#else
+                if (socketpair(AF_UNIX, SOCK_STREAM,0, select_pipe) == -1)
+#endif
                 {
                         DEBUG(0, ("sys_select: pipe failed (%s)\n",

trunk/server/source3/lib/smbrun.c

@@ -83 +83 @@
         }
 
+#ifdef __OS2__
+                char buf[8192];
+                int     n, w;
+                const char *newcmd = sanitize ? escape_shell_string(cmd) : cmd;
+                if (!newcmd) {
+                        close(*outfd);
+                        *outfd = -1;
+                        return(82);
+                }
+                // execute script and capture stdout
+                FILE* pipe = popen( newcmd, "rb");
+                if (pipe) {
+                        // get stdout from pipe
+                        while( !feof( pipe)) {
+                                n = fread( buf, 1, 8192, pipe);
+                                // write to file if required
+                                if (n>0 && outfd!=NULL)
+                                        w = write( *outfd, buf, n);
+                        }
+                        // close and return status
+                        pclose( pipe);
+                        return 0;
+                }
+                // error, close files
+                close(*outfd);
+                *outfd = -1;
+                return 83;
+#else
         /* in this method we will exec /bin/sh with the correct
            arguments, after first setting stdout to point at the file */
@@ -202 +230 @@
         exit(83);
         return 1;
+#endif
 }
 

trunk/server/source3/lib/system.c

@@ -641 +641 @@
 #if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T) && defined(HAVE_FTRUNCATE64)
         return ftruncate64(fd, offset);
+#elif defined(__OS2__)
+        return os2_ftruncate(fd, offset);
 #else
         return ftruncate(fd, offset);
@@ -1571 +1573 @@
         }
         return ret;
+#elif defined(__OS2__)
+        return unigetxattr(path, 0, name, value, size);
 #else
         errno = ENOSYS;
@@ -1622 +1626 @@
         }
         return ret;
+#elif defined(__OS2__)
+        return unigetxattr(path, 0, name, value, size);
 #else
         errno = ENOSYS;
@@ -1675 +1681 @@
         }
         return ret;
+#elif defined(__OS2__)
+        return unigetxattr(0, filedes, name, value, size);
 #else
         errno = ENOSYS;
@@ -1867 +1875 @@
         }
         return ret;
+#elif defined(__OS2__)
+        return unilistxattr(path, 0, list, size);
 #else
         errno = ENOSYS;
@@ -1896 +1906 @@
         }
         return ret;
+#elif defined(__OS2__)
+        return unilistxattr(path, 0, list, size);
 #else
         errno = ENOSYS;
@@ -1927 +1939 @@
         }
         return ret;
+#elif defined(__OS2__)
+        return unilistxattr(0, filedes, list, size);
 #else
         errno = ENOSYS;
@@ -1966 +1980 @@
         }
         return ret;
+#elif defined(__OS2__)
+        return uniremovexattr (path, 0, name);
 #else
         errno = ENOSYS;
@@ -2003 +2019 @@
         }
         return ret;
+#elif defined(__OS2__)
+        return uniremovexattr (path, 0, name);
 #else
         errno = ENOSYS;
@@ -2042 +2060 @@
         }
         return ret;
+#elif defined(__OS2__)
+        return uniremovexattr (0, filedes, name);
 #else
         errno = ENOSYS;
@@ -2107 +2127 @@
         }
         return ret;
+#elif defined(__OS2__)
+        return unisetxattr (path, 0, name, value, size, flags);
 #else
         errno = ENOSYS;
@@ -2171 +2193 @@
         }
         return ret;
+#elif defined(__OS2__)
+        return unisetxattr (path, 0, name, value, size, flags);
 #else
         errno = ENOSYS;
@@ -2236 +2260 @@
         }
         return ret;
+#elif defined(__OS2__)
+        return unisetxattr (0, filedes, name, value, size, flags);
 #else
         errno = ENOSYS;

trunk/server/source3/lib/system_smbd.c

@@ -41 +41 @@
                                   int *grpcnt)
 {
+#ifndef __OS2__groups
         gid_t *gids_saved;
         int ret, ngrp_saved, num_gids;
@@ -112 +113 @@
         free(gids_saved);
         return ret;
+#else
+        *grpcnt = 0;
+        return 0;
+#endif
 }
 #endif

trunk/server/source3/lib/util.c

@@ -2027 +2027 @@
 int set_maxfiles(int requested_max)
 {
-#if (defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE))
+#if (defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE) && !defined(__OS2__))
         struct rlimit rlp;
         int saved_current_limit;

trunk/server/source3/lib/util_sec.c

@@ -93 +93 @@
 static void assert_uid(uid_t ruid, uid_t euid)
 {
+#ifndef __OS2__
         if ((euid != (uid_t)-1 && geteuid() != euid) ||
             (ruid != (uid_t)-1 && getuid() != ruid)) {
@@ -103 +104 @@
                 }
         }
+#endif
 }
 
@@ -110 +112 @@
 static void assert_gid(gid_t rgid, gid_t egid)
 {
+#ifndef __OS2__
         if ((egid != (gid_t)-1 && getegid() != egid) ||
             (rgid != (gid_t)-1 && getgid() != rgid)) {
@@ -121 +124 @@
                 }
         }
+#endif
 }
 

trunk/server/source3/lib/util_sock.c

@@ -1679 +1679 @@
         /* Create the socket directory or reuse the existing one */
 
+#ifndef __OS2__
         if (lstat(socket_dir, &st) == -1) {
                 if (errno == ENOENT) {
@@ -1707 +1708 @@
                 }
         }
+#endif
 
         /* Create the socket file */
@@ -1718 +1720 @@
         }
 
+#ifdef __OS2__
+        if (asprintf(&path, "\\socket\\samba\\%s\\%s", socket_dir, socket_name) == -1) {
+#else       
         if (asprintf(&path, "%s/%s", socket_dir, socket_name) == -1) {
+#endif
                 goto out_close;
         }

trunk/server/source3/lib/util_str.c

@@ -2264 +2264 @@
 *******************************************************************/
 
+#ifdef __OS2__
+#define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_/ \t.,:"
+#else
 #define INCLUDE_LIST "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_/ \t.,"
+#endif
 #define INSIDE_DQUOTE_LIST "$`\n\"\\"
 

trunk/server/source3/libaddns/dns.h

@@ -41 +41 @@
 #include <fcntl.h>
 #include <time.h>
+#ifndef __OS2__
 #include <string.h>
+#endif
 #include <errno.h>
 #include <netdb.h>

trunk/server/source3/libaddns/dnserr.h

@@ -36 +36 @@
 /* Setup the DNS_ERROR typedef.  Technique takes from nt_status.h */
 
-#if defined(HAVE_IMMEDIATE_STRUCTURES)
+#if defined(HAVE_IMMEDIATE_STRUCTURES) && !defined(__OS2__)
 typedef struct {uint32 v;} DNS_ERROR;
 #define ERROR_DNS(x) ((DNS_ERROR) { x })

trunk/server/source3/libsmb/clientgen.c

@@ -567 +567 @@
         bool mandatory_signing = false;
 
+#ifndef __OS2__
         /* Check the effective uid - make sure we are not setuid */
         if (is_setuid_root()) {
@@ -572 +573 @@
                 return NULL;
         }
+#endif
 
         cli = TALLOC_ZERO_P(NULL, struct cli_state);

trunk/server/source3/libsmb/clifile.c

@@ -4360 +4360 @@
                         &setup, 1, 0,   /* setup, length, max */
                         param, param_len, 10, /* param, length, max */
+#ifdef __OS2__
+                        NULL, data_len, CLI_BUFFER_SIZE /* data, length, max */
+#else
                         NULL, data_len, cli->max_xmit /* data, length, max */
+#endif
                                 )) {
                 return False;
@@ -4502 +4506 @@
         memset(param, 0, 6);
         SSVAL(param,0,fnum);
+#ifndef __OS2__
         SSVAL(param,2,SMB_INFO_SET_EA);
+#else
+        SSVAL(param,2,SMB_INFO_QUERY_ALL_EAS);
+#endif
 
         return cli_get_ea_list(cli, setup, param, 6, ctx, pnum_eas, pea_list);

trunk/server/source3/locking/posix.c

@@ -252 +252 @@
         ret = SMB_VFS_GETLOCK(fsp, poffset, pcount, ptype, &pid);
 
+#ifndef __OS2__ /* file locks currently fail with OS/2's libc */
         if (!ret && ((errno == EFBIG) || (errno == ENOLCK) || (errno ==  EINVAL))) {
 
@@ -277 +278 @@
                 }
         }
+#endif
 
         DEBUG(8,("posix_fcntl_getlock: Lock query call %s\n", ret ? "successful" : "failed"));

trunk/server/source3/nmbd/asyncdns.c

@@ -141 +141 @@
         CatchChild();
 
+#ifdef __OS2__ // cant use pipes here, because select() from innotek lib does work only for sockets.
+        if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd1) < 0)
+        {
+                DEBUG(0,("can't create asyncdns socketpair1 %d\n", errno));
+                return;         
+        }
+        if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd2) < 0)
+        {
+                DEBUG(0,("can't create asyncdns socketpair2 %d\n", errno));
+                close(fd1[0]);
+                close(fd1[1]);
+                return;         
+        }
+        DEBUG(9,("!!!!!!PIPES %d %d %d %d\n", fd1[0], fd1[1], fd2[0], fd2[1]));
+#else
         if (pipe(fd1) || pipe(fd2)) {
                 DEBUG(0,("can't create asyncdns pipes\n"));
                 return;
         }
+#endif
 
         child_pid = sys_fork();

trunk/server/source3/nmbd/nmbd.c

@@ -30 +30 @@
 extern bool global_in_nmbd;
 
+#ifdef __OS2__
+extern int global_Sem32Add;
+#endif
+
 extern bool override_logfile;
 
@@ -384 +388 @@
                 reload_nmbd_services( True );
         }
+
+#ifdef __OS2__
+        /* restore the logfile to log.nmbd if !override_logfile */
+        if (!override_logfile) {
+                char *lfile = NULL;
+                if (asprintf(&lfile, "%s/log.nmbd", get_dyn_LOGFILEBASE()) < 0) {
+                        exit(1);
+                }
+                lp_set_logfile(lfile);
+                SAFE_FREE(lfile);
+        }
+#endif
 
         return(ret);
@@ -776 +792 @@
         TALLOC_CTX *frame = talloc_stackframe(); /* Setup tos. */
 
+#ifdef __OS2__
+        global_Sem32Add = 1;
+#endif
+
         load_case_tables();
 

trunk/server/source3/nmbd/nmbd_serverlistdb.c

@@ -331 +331 @@
                 return;
         }
+#ifndef __OS2__
         fnamenew = talloc_asprintf(ctx, "%s.",
+#else
+        fnamenew = talloc_asprintf(ctx, "%s.tmp",
+#endif
                                 fname);
         if (!fnamenew) {
@@ -418 +422 @@
 
         x_fclose(fp);
+#ifdef __OS2__
+        close(fp);
+#endif
         unlink(fname);
         chmod(fnamenew,0644);

trunk/server/source3/nmbd/nmbd_winsserver.c

@@ -2389 +2389 @@
 
         x_fclose(fp);
+#ifdef __OS2__
+        close(fp);
+#endif
         chmod(fnamenew,0644);
         unlink(fname);

trunk/server/source3/param/loadparm.c

@@ -4665 +4665 @@
                 case PRINT_AIX:
                 case PRINT_LPRNT:
+#ifndef __OS2__
                 case PRINT_LPROS2:
+#endif
                         string_set(&pService->szLpqcommand, "lpq -P'%p'");
                         string_set(&pService->szLprmcommand, "lprm -P'%p' %j");
                         string_set(&pService->szPrintcommand, "lpr -r -P'%p' %s");
                         break;
+#ifdef __OS2__
+                case PRINT_LPROS2:
+                        string_set(&pService->szLpqcommand, "lpq.exe -s %i -p %p");
+                        string_set(&pService->szLprmcommand, "lprm.exe -s %i -p %p %j");
+                        string_set(&pService->szPrintcommand, "lpr.exe -b -s %i -p %p %s & cmd.exe /c del %s");
+                        break;
+#endif          
 
                 case PRINT_LPRNG:
@@ -4938 +4947 @@
         string_set(&Globals.szGuestaccount, GUEST_ACCOUNT);
 
+#ifdef __OS2__
+        /* search the system codepage and set OS2CodePageStr */
+        unsigned long _System DosQueryCp (unsigned long ulLength, unsigned long *pCodePageList, unsigned long *pDataLength);
+        char *OS2CodePageStr=NULL;
+        unsigned long OS2CodePage[3];
+        unsigned long OS2CodePageLen;
+        if ( DosQueryCp( sizeof(OS2CodePage), OS2CodePage, &OS2CodePageLen ) )
+           asprintf(&OS2CodePageStr, "SYSTEM");
+          else
+           asprintf(&OS2CodePageStr, "IBM-%u", OS2CodePage[0]);
+#endif
+#ifndef __OS2__
         /* using UTF8 by default allows us to support all chars */
         string_set(&Globals.unix_charset, DEFAULT_UNIX_CHARSET);
+#else
+        /* On OS/2, using UTF8 causes problems with display of foreign 
+           characters - default to system codepage */
+        string_set(&Globals.unix_charset, OS2CodePageStr);
+#endif
 
 #if defined(HAVE_NL_LANGINFO) && defined(CODESET)
         /* If the system supports nl_langinfo(), try to grab the value
            from the user's locale */
+#ifndef __OS2__
         string_set(&Globals.display_charset, "LOCALE");
+#else
+        /* On OS/2, using UTF8 causes problems with display of foreign 
+           characters - default to system codepage */
+        string_set(&Globals.display_charset, OS2CodePageStr);
+#endif  
+
 #else
         string_set(&Globals.display_charset, DEFAULT_DISPLAY_CHARSET);
 #endif
 
+#ifndef __OS2__
         /* Use codepage 850 as a default for the dos character set */
         string_set(&Globals.dos_charset, DEFAULT_DOS_CHARSET);
+#else
+        /* On OS/2, using UTF8 causes problems with display of foreign 
+           characters - default to system codepage */
+        string_set(&Globals.dos_charset, OS2CodePageStr);
+#endif
 
         /*

trunk/server/source3/passdb/pdb_smbpasswd.c

@@ -277 +277 @@
                          */
 
+#ifndef __OS2__
                         if (sys_stat(pfile, &sbuf1, false) != 0) {
                                 DEBUG(0, ("startsmbfilepwent_internal: unable to stat file %s. \
@@ -294 +295 @@
 
                         if( sbuf1.st_ex_ino == sbuf2.st_ex_ino) {
+#else
                                 /* No race. */
+                        {
+#endif
                                 break;
                         }
@@ -315 +319 @@
         setvbuf(fp, (char *)NULL, _IOFBF, 1024);
 
+#ifndef __OS2__
         /* Make sure it is only rw by the owner */
 #ifdef HAVE_FCHMOD
@@ -327 +332 @@
                 return NULL;
         }
+#endif
 
         /* We have a lock on the file. */
@@ -1168 +1174 @@
          * Do an atomic rename - then release the locks.
          */
+#ifdef __OS2__
+        endsmbfilepwent(fp, &smbpasswd_state->pw_file_lock_depth);
+        endsmbfilepwent(fp_write,&pfile2_lockdepth);
+#endif
 
         if(rename(pfile2,pfile) != 0) {
@@ -1173 +1183 @@
         }
 
+#ifndef __OS2__
         endsmbfilepwent(fp, &smbpasswd_state->pw_file_lock_depth);
         endsmbfilepwent(fp_write,&pfile2_lockdepth);
+#endif
         return True;
 }

trunk/server/source3/printing/printing.c

@@ -1431 +1431 @@
         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);

trunk/server/source3/rpc_server/srv_srvsvc_nt.c

@@ -179 +179 @@
 
         if ( strcmp( fname, "." ) == 0 ) {
+#ifndef __OS2__
                 fullpath = talloc_asprintf(fenum->ctx, "C:%s", sharepath );
+#else
+                fullpath = talloc_asprintf(fenum->ctx, "%s%s",
+                                                                (strchr( sharepath,':')) ? "" : "C:", sharepath ); 
+#endif
         } else {
+#ifndef __OS2__
                 fullpath = talloc_asprintf(fenum->ctx, "C:%s/%s",
                                 sharepath, fname );
+#else
+                fullpath = talloc_asprintf(fenum->ctx, "%s%s/%s",
+                                (strchr( sharepath,':')) ? "" : "C:", sharepath, fname );
+#endif
         }
         if (!fullpath) {
@@ -294 +304 @@
                         "", remark);
         }
+#ifdef __OS2__
+        if (strchr( lp_pathname(snum), ':')) 
+                path = talloc_asprintf(p->mem_ctx,"%s", lp_pathname(snum));
+        else 
+#endif  
+
         path = talloc_asprintf(p->mem_ctx,
                         "C:%s", lp_pathname(snum));
@@ -386 +402 @@
                         "", remark);
         }
+#ifdef __OS2__
+        if (strchr( lp_pathname(snum), ':')) 
+                path = talloc_asprintf(ctx, "%s", lp_pathname(snum));
+        else 
+#endif  
         path = talloc_asprintf(ctx, "C:%s", lp_pathname(snum));
         if (path) {
@@ -1489 +1510 @@
         }
 
+#ifdef __OS2__
+        /* Only absolute paths allowed. */ 
+        if (strlen(ptr) < 2 || ptr[1] != ':') 
+                return NULL; 
+#else
         /* NT is braindead - it wants a C: prefix to a pathname ! So strip it. */
         if (strlen(ptr) > 2 && ptr[1] == ':' && ptr[0] != '/')
@@ -1496 +1522 @@
         if (*ptr != '/')
                 return NULL;
+#endif
 
         return ptr;
@@ -2338 +2365 @@
 ***********************************************************************************/
 
+#ifndef __OS2__ 
 static const char *server_disks[] = {"C:"};
+#else // YD we can use a better implementation (real time scan or above idea) 
+static const char *server_disks[] = {"C:","D:","E:","F:","G:","H:","I:","J:","K:","L:","M:","N:","O:",
+                                            "P:","Q:","R:","S:","T:","U:","V:","W:","X:","Y:","Z:"};
+#endif 
 
 static uint32 get_server_disk_count(void)

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"));

trunk/server/source3/torture/torture.c

@@ -5026 +5026 @@
         printf("num_eas = %d\n", (int)num_eas);
 
+#ifdef __OS2__ // add libc UNIX emulation EAs
+        if (num_eas != 27) {
+#else
         if (num_eas != 20) {
+#endif
                 printf("Should be 20 EA's stored... failing.\n");
                 correct = False;
@@ -5040 +5044 @@
         printf("Now deleting all EA's - case indepenent....\n");
 
-#if 1
+#if 0 // YD see bug#3212, smb_info_set_ea(), this is a NOP now!
         cli_set_ea_path(cli, fname, "", "", 0);
 #else

trunk/server/source3/utils/net_usershare.c

@@ -946 +946 @@
 
         /* Attempt to replace any existing share by this name. */
+#ifdef __OS2__
+        close(tmpfd);
+#endif
         if (rename(full_path_tmp, full_path) != 0) {
                 unlink(full_path_tmp);
@@ -957 +960 @@
         }
 
+#ifndef __OS2__
         close(tmpfd);
+#endif
 
         if (c->opt_long_list_entries) {

trunk/server/source3/utils/net_util.c

@@ -100 +100 @@
         int flags = 0;
 
+#ifdef __OS2__
+        if (!c->opt_user_name || c->opt_user_name == NULL) {
+                d_printf("The username was not set.\n");
+                return NT_STATUS_LOGON_FAILURE;
+        }
+#endif
+
         c->opt_password = net_prompt_pass(c, c->opt_user_name);
 

trunk/server/source3/web/cgi.c

@@ -315 +315 @@
         }
 
+#ifndef __OS2__
         pwd = getpwnam_alloc(talloc_autofree_context(), user);
         if (!pwd) {
@@ -329 +330 @@
         }
         TALLOC_FREE(pwd);
+#endif
 }
 

trunk/server/source3/web/startstop.c

@@ -19 +19 @@
 
 #include "includes.h"
+
+#ifdef __OS2__
+        /* fork() in klibc on OS/2 ends all children when parent 
+           is closed, therefore we use spawn() */
+#include "process.h"
+#define SWAT_HELPER(WHAT, WHO) \
+        asprintf(&binfile, "%s/swathelp.cmd", getcwd(NULL, _MAX_PATH)); \
+        int rc; \
+        rc=spawnl(P_NOWAIT, binfile, binfile, #WHAT, #WHO, NULL);
+#endif
+
 #include "web/swat_proto.h"
 #include "dynconfig.h"
@@ -32 +43 @@
         }
 
+#ifdef __OS2__
+        /* fork() in klibc on OS/2 ends all children when parent 
+           is closed, therefore we use spawn() */
+        SWAT_HELPER(start, smbd)       
+#else   
         if (fork()) {
                 return;
@@ -41 +57 @@
         }
         exit(0);
+#endif
 }
 
@@ -52 +69 @@
         }
 
+#ifdef __OS2__
+        /* fork() in klibc on OS/2 ends all children when parent 
+           is closed, therefore we use spawn() */
+        SWAT_HELPER(start, nmbd)
+#else   
         if (fork()) {
                 return;
@@ -61 +83 @@
         }
         exit(0);
+#endif
 }
 
@@ -72 +95 @@
         }
 
+#ifdef __OS2__
+        /* fork() in klibc on OS/2 ends all children when parent 
+           is closed, therefore we use spawn() */
+        SWAT_HELPER(start, winbindd)
+#else   
         if (fork()) {
                 return;
@@ -81 +109 @@
         }
         exit(0);
+#endif
 }
 
@@ -91 +120 @@
         if (geteuid() != 0) return;
 
+#ifdef __OS2__  /* we do it a bit nicer */
+        if (smbd_running()) {
+                char *binfile = NULL;
+                SWAT_HELPER(stop, smbd)
+        }
+#else
         if (pid <= 0) return;
 
         kill(pid, SIGTERM);
+#endif
 }
 
@@ -103 +139 @@
         if (geteuid() != 0) return;
 
+#ifdef __OS2__  /* we do it a bit nicer */
+        if (nmbd_running()) {
+                char *binfile = NULL;
+                SWAT_HELPER(stop, nmbd)
+        }
+#else
         if (pid <= 0) return;
 
         kill(pid, SIGTERM);
+#endif
 }
 #ifdef WITH_WINBIND
@@ -115 +158 @@
         if (geteuid() != 0) return;
 
+#ifdef __OS2__  /* we do it a bit nicer */
+        if (winbindd_running()) {
+                char *binfile = NULL;
+                SWAT_HELPER(stop, winbindd)
+        }
+#else
         if (pid <= 0) return;
 
         kill(pid, SIGTERM);
+#endif
 }
 #endif

trunk/server/source3/web/swat.c

@@ -1437 +1437 @@
         load_printers();
 
+#ifndef __OS2__
         cgi_setup(get_dyn_SWATDIR(), !demo_mode);
+#else
+
+#if 0
+        debug_set_logfile("swat.log"); // this produces a logfile in the dir where swat.exe is located. 
+#endif
+
+        fstring path;
+        fstrcpy(path, getcwd(NULL, _MAX_PATH));
+        fstrcat(path, "/swat");
+        cgi_setup(path, !demo_mode);
+#endif
 
         print_header();