Changeset 312

Timestamp:

Aug 5, 2009, 6:34:45 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.0 to final 3.0.36 (source)

Location:

branches/samba-3.0/source

Files:

• Makefile.in (modified) (3 diffs)
• VERSION (modified) (2 diffs)
• client/mount.cifs.c (modified) (59 diffs)
• client/umount.cifs.c (modified) (3 diffs)
• configure (modified) (1 diff)
• configure.os2 (modified) (1 diff)
• include/includes.h (modified) (1 diff)
• include/version.h (modified) (1 diff)
• lib/replace/libreplace.m4 (modified) (1 diff)
• libaddns/dns.h (modified) (1 diff)
• libads/cldap.c (modified) (1 diff)
• libads/ldap.c (modified) (3 diffs)
• libsmb/clientgen.c# (deleted)
• libsmb/namequery.c (modified) (1 diff)
• modules/nfs4_acls.c (modified) (2 diffs)
• modules/vfs_default.c (modified) (1 diff)
• nsswitch/winbindd_passdb.c (modified) (2 diffs)
• nsswitch/wins.c (modified) (8 diffs)
• param/loadparm.c (modified) (17 diffs)
• rpc_server/srv_netlog_nt.c (modified) (2 diffs)
• rpc_server/srv_pipe.c (modified) (1 diff)
• script/installman.sh (modified) (2 diffs)
• script/uninstalldat.# (deleted)
• script/uninstallmsg.# (deleted)
• script/uninstallswat# (deleted)
• smbd/lanman.c (modified) (1 diff)
• smbd/posix_acls.c (modified) (9 diffs)
• smbd/server.c (modified) (1 diff)
• smbd/trans2.c (modified) (1 diff)

branches/samba-3.0/source/Makefile.in

@@ -145 +145 @@
 # Note that all executable programs now provide for an optional executable suffix.
 
-SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ bin/swat@EXEEXT@ @EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@
+SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ bin/swat@EXEEXT@ @EXTRA_SBIN_PROGS@
 
 ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
@@ -1600 +1600 @@
 
 installcifsupcall: @CIFSUPCALL_PROGS@
-        @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(SBINDIR)
-        @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) @CIFSUPCALL_PROGS@
+        @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(SBINDIR)
+        @$(SHELL) script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(SBINDIR) @CIFSUPCALL_PROGS@
 
 # Some symlinks are required for the 'probing' of modules.
@@ -1735 +1735 @@
 
 uninstallcifsupcall:
-        @$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSUPCALL_PROGS@
+        @$(SHELL) script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSUPCALL_PROGS@
 
 uninstallmodules:

branches/samba-3.0/source/VERSION

@@ -26 +26 @@
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=0
-SAMBA_VERSION_RELEASE=35
+SAMBA_VERSION_RELEASE=36
 
 ########################################################
@@ -96 +96 @@
 #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
 ########################################################
-SAMBA_VERSION_VENDOR_SUFFIX=
+SAMBA_VERSION_VENDOR_SUFFIX="eCS 1.0.2"
 SAMBA_VERSION_VENDOR_PATCH=

branches/samba-3.0/source/client/mount.cifs.c

@@ -2 +2 @@
    Mount helper utility for Linux CIFS VFS (virtual filesystem) client
    Copyright (C) 2003,2008 Steve French  (sfrench@us.ibm.com)
+   Copyright (C) 2008 Jeremy Allison (jra@samba.org)
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
@@ -14 +15 @@
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _GNU_SOURCE
@@ -58 +58 @@
 #endif /* MOUNT_CIFS_VENDOR_SUFFIX */
 
+#ifdef _SAMBA_BUILD_
+#include "include/config.h"
+#endif
+
 #ifndef MS_MOVE 
 #define MS_MOVE 8192 
@@ -70 +74 @@
 #define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
 
+#ifndef SAFE_FREE
+#define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0)
+#endif
+
+#define MOUNT_PASSWD_SIZE 64
+#define DOMAIN_SIZE 64
+
+/* currently maximum length of IPv6 address string */
+#define MAX_ADDRESS_LEN INET6_ADDRSTRLEN
+
 const char *thisprogram;
 int verboseflag = 0;
+int fakemnt = 0;
 static int got_password = 0;
 static int got_user = 0;
@@ -89 +104 @@
 /* like strncpy but does not 0 fill the buffer and always null
  *    terminates. bufsize is the size of the destination buffer */
+
+#ifndef HAVE_STRLCPY
 static size_t strlcpy(char *d, const char *s, size_t bufsize)
 {
@@ -99 +116 @@
         return ret;
 }
+#endif
 
 /* like strncat but does not 0 fill the buffer and always null
  *    terminates. bufsize is the length of the buffer, which should
  *       be one more than the maximum resulting string length */
+
+#ifndef HAVE_STRLCAT
 static size_t strlcat(char *d, const char *s, size_t bufsize)
 {
@@ -121 +141 @@
         return ret;
 }
+#endif
 
 /* BB finish BB
@@ -143 +164 @@
         printf("\n\tcredentials=<filename>,guest,perm,noperm,setuids,nosetuids,rw,ro,");
         printf("\n\tsep=<char>,iocharset=<codepage>,suid,nosuid,exec,noexec,serverino,");
-        printf("\n\tdirectio,mapchars,nomapchars,nolock,servernetbiosname=<SRV_RFC1001NAME>");
+        printf("\n\tmapchars,nomapchars,nolock,servernetbiosname=<SRV_RFC1001NAME>");
+        printf("\n\tdirectio,nounix,cifsacl,sec=<authentication mechanism>,sign");
         printf("\n\nOptions not needed for servers supporting CIFS Unix extensions");
         printf("\n\t(e.g. unneeded for mounts to most Samba versions):");
@@ -150 +172 @@
         printf("\n\tport=<tcpport>,rsize=<size>,wsize=<size>,unc=<unc_name>,ip=<ip_address>,");
         printf("\n\tdev,nodev,nouser_xattr,netbiosname=<OUR_RFC1001NAME>,hard,soft,intr,");
-        printf("\n\tnointr,ignorecase,noposixpaths,noacl");
+        printf("\n\tnointr,ignorecase,noposixpaths,noacl,prefixpath=<path>,nobrl");
+        printf("\n\tin6_addr");
         printf("\n\nOptions are described in more detail in the manual page");
         printf("\n\tman 8 mount.cifs\n");
@@ -156 +179 @@
         printf("\n\t%s -V\n",thisprogram);
 
-        if(mountpassword) {
-                memset(mountpassword,0,64);
-                free(mountpassword);
-                mountpassword = NULL;
-        }
+        SAFE_FREE(mountpassword);
         exit(EX_USAGE);
 }
@@ -173 +192 @@
         }
         return username;
-}
-
-static char * parse_cifs_url(char * unc_name)
-{
-        printf("\nMounting cifs URL not implemented yet. Attempt to mount %s\n",unc_name);
-        return NULL;
 }
 
@@ -193 +206 @@
         if(line_buf == NULL) {
                 fclose(fs);
-                return -ENOMEM;
+                return ENOMEM;
         }
 
@@ -213 +226 @@
                                         if ((temp_val[length] == '\n')
                                             || (temp_val[length] == '\0')) {
+                                                temp_val[length] = '\0';
                                                 break;
                                         }
@@ -219 +233 @@
                                         printf("mount.cifs failed due to malformed username in credentials file");
                                         memset(line_buf,0,4096);
-                                        if(mountpassword) {
-                                                memset(mountpassword,0,64);
-                                        }
                                         exit(EX_USAGE);
                                 } else {
@@ -228 +239 @@
                                         /* BB adding free of user_name string before exit,
                                                 not really necessary but would be cleaner */
-                                        strncpy(user_name,temp_val, length);
+                                        strlcpy(user_name,temp_val, length+1);
                                 }
                         }
@@ -236 +247 @@
                                 /* go past equals sign */
                                 temp_val++;
-                                for(length = 0;length<65;length++) {
+                                for(length = 0;length<MOUNT_PASSWD_SIZE+1;length++) {
                                         if ((temp_val[length] == '\n')
                                             || (temp_val[length] == '\0')) {
+                                                temp_val[length] = '\0';
                                                 break;
                                         }
                                 }
-                                if(length > 64) {
+                                if(length > MOUNT_PASSWD_SIZE) {
                                         printf("mount.cifs failed: password in credentials file too long\n");
                                         memset(line_buf,0, 4096);
-                                        if(mountpassword) {
-                                                memset(mountpassword,0,64);
-                                        }
                                         exit(EX_USAGE);
                                 } else {
                                         if(mountpassword == NULL) {
-                                                mountpassword = (char *)calloc(65,1);
+                                                mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
                                         } else
-                                                memset(mountpassword,0,64);
+                                                memset(mountpassword,0,MOUNT_PASSWD_SIZE);
                                         if(mountpassword) {
-                                                strncpy(mountpassword,temp_val,length);
+                                                strlcpy(mountpassword,temp_val,MOUNT_PASSWD_SIZE+1);
                                                 got_password = 1;
                                         }
@@ -267 +276 @@
                                 if(verboseflag)
                                         printf("\nDomain %s\n",temp_val);
-                                for(length = 0;length<65;length++) {
+                                for(length = 0;length<DOMAIN_SIZE+1;length++) {
                                         if ((temp_val[length] == '\n')
                                             || (temp_val[length] == '\0')) {
+                                                temp_val[length] = '\0';
                                                 break;
                                         }
                                 }
-                                if(length > 64) {
+                                if(length > DOMAIN_SIZE) {
                                         printf("mount.cifs failed: domain in credentials file too long\n");
-                                        if(mountpassword) {
-                                                memset(mountpassword,0,64);
-                                        }
                                         exit(EX_USAGE);
                                 } else {
                                         if(domain_name == NULL) {
-                                                domain_name = (char *)calloc(65,1);
+                                                domain_name = (char *)calloc(DOMAIN_SIZE+1,1);
                                         } else
-                                                memset(domain_name,0,64);
+                                                memset(domain_name,0,DOMAIN_SIZE);
                                         if(domain_name) {
-                                                strncpy(domain_name,temp_val,length);
+                                                strlcpy(domain_name,temp_val,DOMAIN_SIZE+1);
                                                 got_domain = 1;
                                         }
@@ -294 +301 @@
         }
         fclose(fs);
-        if(line_buf) {
-                memset(line_buf,0,4096);
-                free(line_buf);
-                line_buf = NULL;
-        }
+        SAFE_FREE(line_buf);
         return 0;
 }
@@ -309 +312 @@
 
         if(mountpassword == NULL)
-                mountpassword = (char *)calloc(65,1);
+                mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
         else 
-                memset(mountpassword, 0, 64);
+                memset(mountpassword, 0, MOUNT_PASSWD_SIZE);
 
         if (mountpassword == NULL) {
@@ -328 +331 @@
         /* else file already open and fd provided */
 
-        for(i=0;i<64;i++) {
+        for(i=0;i<MOUNT_PASSWD_SIZE;i++) {
                 rc = read(file_descript,&c,1);
                 if(rc < 0) {
                         printf("mount.cifs failed. Error %s reading password file\n",strerror(errno));
-                        memset(mountpassword,0,64);
                         if(filename != NULL)
                                 close(file_descript);
@@ -344 +346 @@
                 } else /* read valid character */ {
                         if((c == 0) || (c == '\n')) {
+                                mountpassword[i] = '\0';
                                 break;
                         } else 
@@ -349 +352 @@
                 }
         }
-        if((i == 64) && (verboseflag)) {
-                printf("\nWarning: password longer than 64 characters specified in cifs password file");
+        if((i == MOUNT_PASSWD_SIZE) && (verboseflag)) {
+                printf("\nWarning: password longer than %d characters specified in cifs password file",
+                        MOUNT_PASSWD_SIZE);
         }
         got_password = 1;
@@ -428 +432 @@
                                 } else {
                                         printf("username specified with no parameter\n");
+                                        SAFE_FREE(out);
                                         return 1;       /* needs_arg; */
                                 }
@@ -437 +442 @@
                                                 *percent_char = ',';
                                                 if(mountpassword == NULL)
-                                                        mountpassword = (char *)calloc(65,1);
+                                                        mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
                                                 if(mountpassword) {
                                                         if(got_password)
@@ -443 +448 @@
                                                         got_password = 1;
                                                         percent_char++;
-                                                        strncpy(mountpassword, percent_char,64);
+                                                        strlcpy(mountpassword, percent_char,MOUNT_PASSWD_SIZE+1);
                                                 /*  remove password from username */
                                                         while(*percent_char != 0) {
@@ -460 +465 @@
                                 } else {
                                         printf("username too long\n");
+                                        SAFE_FREE(out);
                                         return 1;
                                 }
@@ -475 +481 @@
                         } else {
                                 printf("password too long\n");
+                                SAFE_FREE(out);
                                 return 1;
                         }
@@ -486 +493 @@
                         if (!value || !*value) {
                                 printf("target ip address argument missing");
-                        } else if (strnlen(value, 35) < 35) {
+                        } else if (strnlen(value, MAX_ADDRESS_LEN) <= MAX_ADDRESS_LEN) {
                                 if(verboseflag)
                                         printf("ip address %s override specified\n",value);
@@ -492 +499 @@
                         } else {
                                 printf("ip address too long\n");
+                                SAFE_FREE(out);
                                 return 1;
                         }
@@ -499 +507 @@
                         if (!value || !*value) {
                                 printf("invalid path to network resource\n");
+                                SAFE_FREE(out);
                                 return 1;  /* needs_arg; */
                         } else if(strnlen(value,5) < 5) {
@@ -513 +522 @@
                                 } else if (strncmp(value, "\\\\", 2) != 0) {                       
                                         printf("UNC Path does not begin with // or \\\\ \n");
+                                        SAFE_FREE(out);
                                         return 1;
                                 } else {
@@ -522 +532 @@
                         } else {
                                 printf("CIFS: UNC name too long\n");
+                                SAFE_FREE(out);
                                 return 1;
                         }
-                } else if ((strncmp(data, "domain", 3) == 0)
-                           || (strncmp(data, "workgroup", 5) == 0)) {
+                } else if ((strncmp(data, "dom" /* domain */, 3) == 0)
+                           || (strncmp(data, "workg", 5) == 0)) {
+                        /* note this allows for synonyms of "domain"
+                           such as "DOM" and "dom" and "workgroup"
+                           and "WORKGRP" etc. */
                         if (!value || !*value) {
                                 printf("CIFS: invalid domain name\n");
+                                SAFE_FREE(out);
                                 return 1;       /* needs_arg; */
                         }
-                        if (strnlen(value, 65) < 65) {
+                        if (strnlen(value, DOMAIN_SIZE+1) < DOMAIN_SIZE+1) {
                                 got_domain = 1;
                         } else {
                                 printf("domain name too long\n");
+                                SAFE_FREE(out);
                                 return 1;
                         }
@@ -540 +556 @@
                                 rc = open_cred_file(value);
                                 if(rc) {
-                                        printf("error %d opening credential file %s\n",rc, value);
+                                        printf("error %d (%s) opening credential file %s\n",
+                                                rc, strerror(rc), value);
+                                        SAFE_FREE(out);
                                         return 1;
                                 }
                         } else {
                                 printf("invalid credential file name specified\n");
+                                SAFE_FREE(out);
                                 return 1;
                         }
@@ -583 +602 @@
                         if (!value || !*value) {
                                 printf ("Option '%s' requires a numerical argument\n", data);
+                                SAFE_FREE(out);
                                 return 1;
                         }
@@ -597 +617 @@
                         if (!value || !*value) {
                                 printf ("Option '%s' requires a numerical argument\n", data);
+                                SAFE_FREE(out);
                                 return 1;
                         }
@@ -630 +651 @@
                         *filesys_flags &= ~MS_NOEXEC;
                 } else if (strncmp(data, "guest", 5) == 0) {
-                        got_password=1;
+                        user_name = (char *)calloc(1, 1);
+                        got_user = 1;
+                        got_password = 1;
                 } else if (strncmp(data, "ro", 2) == 0) {
                         *filesys_flags |= MS_RDONLY;
@@ -718 +741 @@
         }
 
-        free(*optionsp);
+        SAFE_FREE(*optionsp);
         *optionsp = out;
         return 0;
@@ -746 +769 @@
         if(number_of_commas == 0)
                 return;
-        if(number_of_commas > 64) {
+        if(number_of_commas > MOUNT_PASSWD_SIZE) {
                 /* would otherwise overflow the mount options buffer */
                 printf("\nInvalid password. Password contains too many commas.\n");
@@ -765 +788 @@
         new_pass_buf[len+number_of_commas] = 0;
 
-        free(*ppasswrd);
+        SAFE_FREE(*ppasswrd);
         *ppasswrd = new_pass_buf;
         
@@ -860 +883 @@
 
 /* Note that caller frees the returned buffer if necessary */
-static char * parse_server(char ** punc_name)
+static struct addrinfo *
+parse_server(char ** punc_name)
 {
         char * unc_name = *punc_name;
         int length = strnlen(unc_name, MAX_UNC_LEN);
         char * share;
-        char * ipaddress_string = NULL;
-        struct hostent * host_entry = NULL;
-        struct in_addr server_ipaddr;
+        struct addrinfo *addrlist;
+        int rc;
 
         if(length > (MAX_UNC_LEN - 1)) {
@@ -873 +896 @@
                 return NULL;
         }
-        if (strncasecmp("cifs://",unc_name,7) == 0)
-                return parse_cifs_url(unc_name+7);
-        if (strncasecmp("smb://",unc_name,6) == 0) {
-                return parse_cifs_url(unc_name+6);
+        if ((strncasecmp("cifs://", unc_name, 7) == 0) ||
+            (strncasecmp("smb://", unc_name, 6) == 0)) {
+                printf("\nMounting cifs URL not implemented yet. Attempt to mount %s\n", unc_name);
+                return NULL;
         }
 
@@ -896 +919 @@
                                 }
                                 *share = '/';
-                                strncpy((*punc_name)+2,unc_name,length);
-                                free(unc_name);
+                                strlcpy((*punc_name)+2,unc_name,length+1);
+                                SAFE_FREE(unc_name);
                                 unc_name = *punc_name;
                                 unc_name[length+2] = 0;
@@ -917 +940 @@
                                 share += 1;
                                 if(got_ip == 0) {
-                                        host_entry = gethostbyname(unc_name);
+                                        rc = getaddrinfo(unc_name, NULL, NULL, &addrlist);
+                                        if (rc != 0) {
+                                                printf("mount error: could not resolve address for %s: %s\n",
+                                                        unc_name, gai_strerror(rc));
+                                                addrlist = NULL;
+                                        }
                                 }
                                 *(share - 1) = '/'; /* put delimiter back */
@@ -932 +960 @@
                                         return NULL;
                                 }
-                                if(host_entry == NULL) {
-                                        printf("mount error: could not find target server. TCP name %s not found\n", unc_name);
-                                        return NULL;
-                                } else {
-                                        /* BB should we pass an alternate version of the share name as Unicode */
-                                        /* BB what about ipv6? BB */
-                                        /* BB add retries with alternate servers in list */
-
-                                        memcpy(&server_ipaddr.s_addr, host_entry->h_addr, 4);
-
-                                        ipaddress_string = inet_ntoa(server_ipaddr);                                                                                     
-                                        if(ipaddress_string == NULL) {
-                                                printf("mount error: could not get valid ip address for target server\n");
-                                                return NULL;
-                                        }
-                                        return ipaddress_string; 
-                                }
+                                /* BB should we pass an alternate version of the share name as Unicode */
+
+                                return addrlist; 
                         } else {
                                 /* BB add code to find DFS root (send null path on get DFS Referral to specified server here */
@@ -1012 +1026 @@
         char * orgoptions = NULL;
         char * share_name = NULL;
-        char * ipaddr = NULL;
+        const char * ipaddr = NULL;
         char * uuid = NULL;
         char * mountpoint = NULL;
         char * options = NULL;
+        char * optionstail;
         char * resolved_path = NULL;
         char * temp;
         char * dev_name;
-        int rc;
+        int rc = 0;
         int rsize = 0;
         int wsize = 0;
@@ -1028 +1043 @@
         int orgoptlen = 0;
         size_t options_size = 0;
+        size_t current_len;
         int retry = 0; /* set when we have to retry mount with uppercase */
+        struct addrinfo *addrhead = NULL, *addr;
         struct stat statbuf;
         struct utsname sysinfo;
         struct mntent mountent;
+        struct sockaddr_in *addr4;
+        struct sockaddr_in6 *addr6;
         FILE * pmntfile;
 
@@ -1063 +1082 @@
                 mountpoint = argv[2];
         } else {
+                if ((strcmp (argv[1], "--version") == 0) ||
+                    ((strcmp (argv[1], "-V") == 0))) {
+                        printf ("mount.cifs version: %s.%s%s\n",
+                        MOUNT_CIFS_VERSION_MAJOR,
+                        MOUNT_CIFS_VERSION_MINOR,
+                        MOUNT_CIFS_VENDOR_SUFFIX);
+                        exit (0);
+                }
                 mount_cifs_usage();
                 exit(EX_USAGE);
@@ -1088 +1115 @@
                         exit(EX_USAGE);
                 case 'n':
-                    ++nomtab;
-                    break;
+                        ++nomtab;
+                        break;
                 case 'b':
 #ifdef MS_BIND
@@ -1123 +1150 @@
                         MOUNT_CIFS_VERSION_MINOR,
                         MOUNT_CIFS_VENDOR_SUFFIX);
-                        if(mountpassword) {
-                                memset(mountpassword,0,64);
-                        }
                         exit (0);
                 case 'w':
@@ -1186 +1210 @@
                 case 'p':
                         if(mountpassword == NULL)
-                                mountpassword = (char *)calloc(65,1);
+                                mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
                         if(mountpassword) {
                                 got_password = 1;
-                                strncpy(mountpassword,optarg,64);
+                                strlcpy(mountpassword,optarg,MOUNT_PASSWD_SIZE+1);
                         }
                         break;
@@ -1196 +1220 @@
                         break;
                 case 't':
+                        break;
+                case 'f':
+                        ++fakemnt;
                         break;
                 default:
@@ -1211 +1238 @@
         if (getenv("PASSWD")) {
                 if(mountpassword == NULL)
-                        mountpassword = (char *)calloc(65,1);
+                        mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
                 if(mountpassword) {
-                        strncpy(mountpassword,getenv("PASSWD"),64);
+                        strlcpy(mountpassword,getenv("PASSWD"),MOUNT_PASSWD_SIZE+1);
                         got_password = 1;
                 }
@@ -1226 +1253 @@
                 goto mount_exit;
         }
-        ipaddr = parse_server(&share_name);
-        if((ipaddr == NULL) && (got_ip == 0)) {
+        addrhead = addr = parse_server(&share_name);
+        if((addrhead == NULL) && (got_ip == 0)) {
                 printf("No ip address specified and hostname not found\n");
                 rc = EX_USAGE;
@@ -1274 +1301 @@
 
         if(got_user == 0) {
-                user_name = getusername();
+                /* Note that the password will not be retrieved from the
+                   USER env variable (ie user%password form) as there is
+                   already a PASSWD environment varaible */
+                if (getenv("USER"))
+                        user_name = strdup(getenv("USER"));
+                if (user_name == NULL)
+                        user_name = getusername();
                 got_user = 1;
         }
        
         if(got_password == 0) {
-                char *tmp_pass;
-                tmp_pass = getpass("Password: "); /* BB obsolete sys call but
-                                                     no good replacement yet */
-                mountpassword = (char *)calloc(65,1);
+                char *tmp_pass = getpass("Password: "); /* BB obsolete sys call but
+                                                           no good replacement yet. */
+                mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
                 if (!tmp_pass || !mountpassword) {
                         printf("Password not entered, exiting\n");
                         exit(EX_USAGE);
                 }
-                strncpy(mountpassword, tmp_pass, 64);
-                                                 
+                strlcpy(mountpassword, tmp_pass, MOUNT_PASSWD_SIZE+1);
                 got_password = 1;
         }
         /* FIXME launch daemon (handles dfs name resolution and credential change) 
            remember to clear parms and overwrite password field before launching */
-mount_retry:
         if(orgoptions) {
                 optlen = strlen(orgoptions);
@@ -1308 +1338 @@
         if(user_name)
                 optlen += strlen(user_name) + 6;
-        if(ipaddr)
-                optlen += strlen(ipaddr) + 4;
+        optlen += MAX_ADDRESS_LEN + 4;
         if(mountpassword)
                 optlen += strlen(mountpassword) + 6;
-        if(options) {
-                free(options);
-                options = NULL;
-        }
-        options_size = optlen + 10 + 64;
+mount_retry:
+        SAFE_FREE(options);
+        options_size = optlen + 10 + DOMAIN_SIZE;
         options = (char *)malloc(options_size /* space for commas in password */ + 8 /* space for domain=  , domain name itself was counted as part of the length username string above */);
 
@@ -1324 +1351 @@
         }
 
-        options[0] = 0;
-        strlcpy(options,"unc=",options_size);
+        strlcpy(options, "unc=", options_size);
         strlcat(options,share_name,options_size);
         /* scan backwards and reverse direction of slash */
@@ -1331 +1357 @@
         if(temp > options + 6)
                 *temp = '\\';
-        if(ipaddr) {
-                strlcat(options,",ip=",options_size);
-                strlcat(options,ipaddr,options_size);
-        }
-
         if(user_name) {
                 /* check for syntax like user=domain\user */
@@ -1377 +1398 @@
         replace_char(dev_name, '\\', '/', strlen(share_name));
 
-        if(mount(dev_name, mountpoint, "cifs", flags, options)) {
-        /* remember to kill daemon on error */
+        if (!got_ip && addr) {
+                strlcat(options, ",ip=", options_size);
+                current_len = strnlen(options, options_size);
+                optionstail = options + current_len;
+                switch (addr->ai_addr->sa_family) {
+                case AF_INET6:
+                        addr6 = (struct sockaddr_in6 *) addr->ai_addr;
+                        ipaddr = inet_ntop(AF_INET6, &addr6->sin6_addr, optionstail,
+                                           options_size - current_len);
+                        break;
+                case AF_INET:
+                        addr4 = (struct sockaddr_in *) addr->ai_addr;
+                        ipaddr = inet_ntop(AF_INET, &addr4->sin_addr, optionstail,
+                                           options_size - current_len);
+                        break;
+                }
+
+                /* if the address looks bogus, try the next one */
+                if (!ipaddr) {
+                        addr = addr->ai_next;
+                        if (addr)
+                                goto mount_retry;
+                        rc = EX_SYSERR;
+                        goto mount_exit;
+                }
+        }
+
+        if (!fakemnt && mount(dev_name, mountpoint, "cifs", flags, options)) {
                 switch (errno) {
-                case 0:
-                        printf("mount failed but no error number set\n");
+                case ECONNREFUSED:
+                case EHOSTUNREACH:
+                        if (addr) {
+                                addr = addr->ai_next;
+                                if (addr)
+                                        goto mount_retry;
+                        }
                         break;
                 case ENODEV:
@@ -1396 +1448 @@
                                 }
                         }
-                default:
-                        printf("mount error %d = %s\n",errno,strerror(errno));
-                }
+                }
+                printf("mount error(%d): %s\n", errno, strerror(errno));
                 printf("Refer to the mount.cifs(8) manual page (e.g.man mount.cifs)\n");
                 rc = EX_FAIL;
-        } else {
-                atexit(unlock_mtab);
-                rc = lock_mtab();
-                if (rc) {
-                        printf("cannot lock mtab");
-                        goto mount_exit;
-                }
-                pmntfile = setmntent(MOUNTED, "a+");
-                if (!pmntfile) {
-                        printf("could not update mount table\n");
-                        unlock_mtab();
-                        rc = EX_FILEIO;
-                        goto mount_exit;
-                }
-                mountent.mnt_fsname = dev_name;
-                mountent.mnt_dir = mountpoint;
-                mountent.mnt_type = CONST_DISCARD(char *,"cifs");
-                mountent.mnt_opts = (char *)malloc(220);
-                if(mountent.mnt_opts) {
-                        char * mount_user = getusername();
-                        memset(mountent.mnt_opts,0,200);
-                        if(flags & MS_RDONLY)
-                                strlcat(mountent.mnt_opts,"ro",220);
-                        else
-                                strlcat(mountent.mnt_opts,"rw",220);
-                        if(flags & MS_MANDLOCK)
-                                strlcat(mountent.mnt_opts,",mand",220);
-                        if(flags & MS_NOEXEC)
-                                strlcat(mountent.mnt_opts,",noexec",220);
-                        if(flags & MS_NOSUID)
-                                strlcat(mountent.mnt_opts,",nosuid",220);
-                        if(flags & MS_NODEV)
-                                strlcat(mountent.mnt_opts,",nodev",220);
-                        if(flags & MS_SYNCHRONOUS)
-                                strlcat(mountent.mnt_opts,",sync",220);
-                        if(mount_user) {
-                                if(getuid() != 0) {
-                                        strlcat(mountent.mnt_opts,
-                                                ",user=", 220);
-                                        strlcat(mountent.mnt_opts,
-                                                mount_user, 220);
-                                }
-                        }
-                }
-                mountent.mnt_freq = 0;
-                mountent.mnt_passno = 0;
-                rc = addmntent(pmntfile,&mountent);
-                endmntent(pmntfile);
+                goto mount_exit;
+        }
+
+        if (nomtab)
+                goto mount_exit;
+        atexit(unlock_mtab);
+        rc = lock_mtab();
+        if (rc) {
+                printf("cannot lock mtab");
+                goto mount_exit;
+        }
+        pmntfile = setmntent(MOUNTED, "a+");
+        if (!pmntfile) {
+                printf("could not update mount table\n");
                 unlock_mtab();
-                if(mountent.mnt_opts) {
-                        free(mountent.mnt_opts);
-                        mountent.mnt_opts = NULL;
-                }
-                if (rc)
-                        rc = EX_FILEIO;
-        }
+                rc = EX_FILEIO;
+                goto mount_exit;
+        }
+        mountent.mnt_fsname = dev_name;
+        mountent.mnt_dir = mountpoint;
+        mountent.mnt_type = CONST_DISCARD(char *,"cifs");
+        mountent.mnt_opts = (char *)malloc(220);
+        if(mountent.mnt_opts) {
+                char * mount_user = getusername();
+                memset(mountent.mnt_opts,0,200);
+                if(flags & MS_RDONLY)
+                        strlcat(mountent.mnt_opts,"ro",220);
+                else
+                        strlcat(mountent.mnt_opts,"rw",220);
+                if(flags & MS_MANDLOCK)
+                        strlcat(mountent.mnt_opts,",mand",220);
+                if(flags & MS_NOEXEC)
+                        strlcat(mountent.mnt_opts,",noexec",220);
+                if(flags & MS_NOSUID)
+                        strlcat(mountent.mnt_opts,",nosuid",220);
+                if(flags & MS_NODEV)
+                        strlcat(mountent.mnt_opts,",nodev",220);
+                if(flags & MS_SYNCHRONOUS)
+                        strlcat(mountent.mnt_opts,",sync",220);
+                if(mount_user) {
+                        if(getuid() != 0) {
+                                strlcat(mountent.mnt_opts,
+                                        ",user=", 220);
+                                strlcat(mountent.mnt_opts,
+                                        mount_user, 220);
+                        }
+                }
+        }
+        mountent.mnt_freq = 0;
+        mountent.mnt_passno = 0;
+        rc = addmntent(pmntfile,&mountent);
+        endmntent(pmntfile);
+        unlock_mtab();
+        SAFE_FREE(mountent.mnt_opts);
+        if (rc)
+                rc = EX_FILEIO;
 mount_exit:
         if(mountpassword) {
                 int len = strlen(mountpassword);
                 memset(mountpassword,0,len);
-                free(mountpassword);
-                mountpassword = NULL;
-        }
-
-        if(options) {
-                memset(options,0,optlen);
-                free(options);
-                options = NULL;
-        }
-
-        if(orgoptions) {
-                memset(orgoptions,0,orgoptlen);
-                free(orgoptions);
-                orgoptions = NULL;
-        }
-        if(resolved_path) {
-                free(resolved_path);
-                resolved_path = NULL;
-        }
-
-        free(share_name);
+                SAFE_FREE(mountpassword);
+        }
+
+        if (addrhead)
+                freeaddrinfo(addrhead);
+        SAFE_FREE(options);
+        SAFE_FREE(orgoptions);
+        SAFE_FREE(resolved_path);
+        SAFE_FREE(share_name);
         exit(rc);
 }

branches/samba-3.0/source/client/umount.cifs.c

@@ -35 +35 @@
 #include <string.h>
 #include <mntent.h>
+#include <limits.h>
 #include "mount.h"
 
@@ -233 +234 @@
 }
 
+/* Make a canonical pathname from PATH.  Returns a freshly malloced string.
+   It is up the *caller* to ensure that the PATH is sensible.  i.e.
+   canonicalize ("/dev/fd0/.") returns "/dev/fd0" even though ``/dev/fd0/.''
+   is not a legal pathname for ``/dev/fd0''  Anything we cannot parse
+   we return unmodified.   */
+static char *
+canonicalize(char *path)
+{
+        char *canonical = malloc (PATH_MAX + 1);
+
+        if (!canonical) {
+                fprintf(stderr, "Error! Not enough memory!\n");
+                return NULL;
+        }
+
+        if (strlen(path) > PATH_MAX) {
+                fprintf(stderr, "Mount point string too long\n");
+                return NULL;
+        }
+
+        if (path == NULL)
+                return NULL;
+
+        if (realpath (path, canonical))
+                return canonical;
+
+        strncpy (canonical, path, PATH_MAX);
+        canonical[PATH_MAX] = '\0';
+        return canonical;
+}
+
 int main(int argc, char ** argv)
 {
@@ -306 +338 @@
         argc -= optind;
 
-        mountpoint = argv[0];
+        mountpoint = canonicalize(argv[0]);
 
         if((argc < 1) || (argv[0] == NULL)) {

branches/samba-3.0/source/configure

@@ -14036 +14036 @@
 
 
-
-
-
-for ac_header in netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h
+for ac_header in netinet/in_systm.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+               { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+         test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+               { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in netinet/ip.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+         test -z "$ac_c_werror_flag" ||
+         test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+        eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+               { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+for ac_header in netinet/tcp.h netinet/in_ip.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

branches/samba-3.0/source/configure.os2

@@ -5 +5 @@
 AR="emxomfar" \
 LIBS="-lsocket -lsyslog" \
-./configure --prefix=/samba \
+./configure --prefix=/samba --with-acl-support \
          --enable-static --disable-shared \
          --disable-ldap --disable-cups  2>&1 | tee configure.log

branches/samba-3.0/source/include/includes.h

@@ -209 +209 @@
 #endif
 
-#if HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_H
+#if HAVE_GSSAPI_GSSAPI_H
 #include <gssapi/gssapi.h>
 #elif HAVE_GSSAPI_GSSAPI_GENERIC_H
 #include <gssapi/gssapi_generic.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
 #endif
 

branches/samba-3.0/source/include/version.h

@@ -2 +2 @@
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 0
-#define SAMBA_VERSION_RELEASE 35
-#define SAMBA_VERSION_OFFICIAL_STRING "3.0.35"
+#define SAMBA_VERSION_RELEASE 36
+#define SAMBA_VERSION_OFFICIAL_STRING "3.0.36"
+#define SAMBA_VERSION_VENDOR_SUFFIX "eCS 1.0.2"
 #define SAMBA_VERSION_STRING samba_version_string()

branches/samba-3.0/source/lib/replace/libreplace.m4

@@ -98 +98 @@
 AC_CHECK_HEADERS(stdarg.h vararg.h)
 AC_CHECK_HEADERS(sys/socket.h netinet/in.h netdb.h arpa/inet.h)
-AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
+AC_CHECK_HEADERS(netinet/in_systm.h)
+AC_CHECK_HEADERS([netinet/ip.h], [], [], [#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif])
+AC_CHECK_HEADERS(netinet/tcp.h netinet/in_ip.h)
 AC_CHECK_HEADERS(sys/sockio.h sys/un.h)
 AC_CHECK_HEADERS(stropts.h)

branches/samba-3.0/source/libaddns/dns.h

@@ -77 +77 @@
 #endif
 
-#if HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_H
+#if HAVE_GSSAPI_GSSAPI_H
 #include <gssapi/gssapi.h>
 #elif HAVE_GSSAPI_GSSAPI_GENERIC_H
 #include <gssapi/gssapi_generic.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
 #endif
 

branches/samba-3.0/source/libads/cldap.c

@@ -61 +61 @@
                                 followed_ptr = 1;
                         }
-                        len = ((ptr[0] & 0x3f) << 8) | ptr[1];
+                        len = ((ptr[0] & 0x3f) << 8) | (uint8) ptr[1];
                         ptr = data + len;
                 } else if (*ptr) {

branches/samba-3.0/source/libads/ldap.c

@@ -113 +113 @@
                 return LDAP_TIMELIMIT_EXCEEDED;
 
+
+        /*
+         * A bug in OpenLDAP means ldap_search_ext_s can return
+         * LDAP_SUCCESS but with a NULL res pointer. Cope with
+         * this. See bug #6279 for details. JRA.
+         */
+
+        if (*res == NULL) {
+                return LDAP_TIMELIMIT_EXCEEDED;
+        }
+
         return result;
 }
@@ -276 +287 @@
                 got_realm = True;
                    
+ again:
+
         /* we need to try once with the realm name and fallback to the 
            netbios domain name if we fail (if netbios has not been disabled */
@@ -326 +339 @@
 
         sitename = sitename_fetch(realm);
-
- again:
 
         DEBUG(6,("ads_find_dc: (cldap) looking for %s '%s'\n",

branches/samba-3.0/source/libsmb/namequery.c

@@ -1226 +1226 @@
 
         DEBUG(10, ("internal_resolve_name: looking up %s#%x (sitename %s)\n",
-                        name, name_type, sitename ? sitename : NULL));
+                        name, name_type, sitename ? sitename : "(null)"));
 
         if (allzeros || allones || is_address) {

branches/samba-3.0/source/modules/nfs4_acls.c

@@ -588 +588 @@
 
         SMB_STRUCT_STAT sbuf;
-        BOOL need_chown = False;
+        BOOL set_acl_as_root = False;
         uid_t newUID = (uid_t)-1;
         gid_t newGID = (gid_t)-1;
+        int saved_errno;
 
         DEBUG(10, ("smb_set_nt_acl_nfs4 invoked for %s\n", fsp->fsp_name));
@@ -618 +619 @@
                 if (((newUID != (uid_t)-1) && (sbuf.st_uid != newUID)) ||
                         ((newGID != (gid_t)-1) && (sbuf.st_gid != newGID))) {
-                        need_chown = True;
-                }
-                if (need_chown) {
-                        if ((newUID == (uid_t)-1 || newUID == current_user.ut.uid)) {
-                                if(try_chown(fsp->conn, fsp->fsp_name, newUID, newGID)) {
-                                        DEBUG(3,("chown %s, %u, %u failed. Error = %s.\n",
-                                                fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID, strerror(errno) ));
-                                        return False;
-                                }
-                                DEBUG(10,("chown %s, %u, %u succeeded.\n",
-                                        fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID));
-                                if (smbacl4_GetFileOwner(fsp, &sbuf))
-                                        return False;
-                                need_chown = False;
-                        } else { /* chown is needed, but _after_ changing acl */
-                                sbuf.st_uid = newUID; /* OWNER@ in case of e_special */
-                                sbuf.st_gid = newGID; /* GROUP@ in case of e_special */
-                        }
-                }
-        }
-
-        if ((security_info_sent & DACL_SECURITY_INFORMATION)!=0 && psd->dacl!=NULL)
-        {
-                acl = smbacl4_win2nfs4(psd->dacl, &params, sbuf.st_uid, sbuf.st_gid);
-                if (!acl)
-                        return False;
-
-                smbacl4_dump_nfs4acl(10, acl);
-
-                result = set_nfs4_native(fsp, acl);
-                if (result!=True)
-                {
-                        DEBUG(10, ("set_nfs4_native failed with %s\n", strerror(errno)));
-                        return False;
-                }
-        } else
+                        if(try_chown(fsp->conn, fsp->fsp_name, newUID, newGID)) {
+                                DEBUG(3,("chown %s, %u, %u failed. Error = %s.\n",
+                                        fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID, strerror(errno) ));
+                                return False;
+                        }
+                        DEBUG(10,("chown %s, %u, %u succeeded.\n",
+                                fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID));
+                        if (smbacl4_GetFileOwner(fsp, &sbuf))
+                                return False;
+                        /* If we successfully chowned, we know we must
+                         * be able to set the acl, so do it as root.
+                         */
+                        set_acl_as_root = True;
+                }
+        }
+
+        if (!(security_info_sent & DACL_SECURITY_INFORMATION) || psd->dacl ==NULL) {
                 DEBUG(10, ("no dacl found; security_info_sent = 0x%x\n", security_info_sent));
-
-        /* Any chown pending? */
-        if (need_chown) {
-                DEBUG(3,("chown#2 %s. uid = %u, gid = %u.\n",
-                        fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID));
-                if (try_chown(fsp->conn, fsp->fsp_name, newUID, newGID)) {
-                        DEBUG(2,("chown#2 %s, %u, %u failed. Error = %s.\n",
-                                fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID,
-                                strerror(errno)));
-                        return False;
-                }
-                DEBUG(10,("chown#2 %s, %u, %u succeeded.\n",
-                        fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID));
+                return True;
+        }
+        acl = smbacl4_win2nfs4(psd->dacl, &params, sbuf.st_uid, sbuf.st_gid);
+        if (!acl)
+                return False;
+
+        smbacl4_dump_nfs4acl(10, acl);
+
+        if (set_acl_as_root) {
+                become_root();
+        }
+        result = set_nfs4_native(fsp, acl);
+        saved_errno = errno;
+        if (set_acl_as_root) {
+                unbecome_root();
+        }
+        if (result!=True) {
+                errno = saved_errno;
+                DEBUG(10, ("set_nfs4_native failed with %s\n", strerror(errno)));
+                return False;
         }
 

branches/samba-3.0/source/modules/vfs_default.c

@@ -636 +636 @@
                 times.actime = convert_timespec_to_time_t(ts[0]);
                 times.modtime = convert_timespec_to_time_t(ts[1]);
-                result = utime(path, times);
+                result = utime(path, &times);
         }
 #else

branches/samba-3.0/source/nsswitch/winbindd_passdb.c

@@ -591 +591 @@
                         continue;
                 }
-                if (!((*names)[i] = talloc_strdup((*names),
+                if (!((*names)[num_mapped] = talloc_strdup((*names),
                                                   lsa_names[i].name))) {
                         TALLOC_FREE(tmp_ctx);
@@ -597 +597 @@
                 }
 
-                (*name_types)[i] = lsa_names[i].type;
+                (*name_types)[num_mapped] = lsa_names[i].type;
 
                 num_mapped += 1;

branches/samba-3.0/source/nsswitch/wins.c

@@ -25 +25 @@
 
 #include <ns_daemon.h>
+#endif
+
+#if HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+
+#if HAVE_PTHREAD
+static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif
 
@@ -298 +306 @@
                           char *buffer, size_t buflen, int *h_errnop)
 {
+        NSS_STATUS nss_status = NSS_STATUS_SUCCESS;
         struct in_addr *ip_list;
         int i, count;
@@ -303 +312 @@
         size_t namelen;
                 
+#if HAVE_PTHREAD
+        pthread_mutex_lock(&wins_nss_mutex);
+#endif
+
         memset(he, '\0', sizeof(*he));
         fstrcpy(name, hostname);
@@ -310 +323 @@
         ip_list = lookup_byname_backend(name, &count);
 
-        if (!ip_list)
-                return NSS_STATUS_NOTFOUND;
+        if (!ip_list) {
+                nss_status = NSS_STATUS_NOTFOUND;
+                goto out;
+        }
 
         /* Copy h_name */
@@ -317 +332 @@
         namelen = strlen(name) + 1;
 
-        if ((he->h_name = get_static(&buffer, &buflen, namelen)) == NULL)
-                return NSS_STATUS_TRYAGAIN;
+        if ((he->h_name = get_static(&buffer, &buflen, namelen)) == NULL) {
+                nss_status = NSS_STATUS_TRYAGAIN;
+                goto out;
+        }
 
         memcpy(he->h_name, name, namelen);
@@ -327 +344 @@
                 i = sizeof(char*) - i;
 
-        if (get_static(&buffer, &buflen, i) == NULL)
-                return NSS_STATUS_TRYAGAIN;
+        if (get_static(&buffer, &buflen, i) == NULL) {
+                nss_status = NSS_STATUS_TRYAGAIN;
+                goto out;
+        }
 
         if ((he->h_addr_list = (char **)get_static(
-                     &buffer, &buflen, (count + 1) * sizeof(char *))) == NULL)
-                return NSS_STATUS_TRYAGAIN;
+                     &buffer, &buflen, (count + 1) * sizeof(char *))) == NULL) {
+                nss_status = NSS_STATUS_TRYAGAIN;
+                goto out;
+        }
 
         for (i = 0; i < count; i++) {
                 if ((he->h_addr_list[i] = get_static(&buffer, &buflen,
-                                                     INADDRSZ)) == NULL)
-                        return NSS_STATUS_TRYAGAIN;
+                                                     INADDRSZ)) == NULL) {
+                        nss_status = NSS_STATUS_TRYAGAIN;
+                        goto out;
+                }
                 memcpy(he->h_addr_list[i], &ip_list[i], INADDRSZ);
         }
@@ -356 +379 @@
                 i = sizeof(char*) - i;
 
-        if (get_static(&buffer, &buflen, i) == NULL)
-                return NSS_STATUS_TRYAGAIN;
+        if (get_static(&buffer, &buflen, i) == NULL) {
+                nss_status = NSS_STATUS_TRYAGAIN;
+                goto out;
+        }
 
         if ((he->h_aliases = (char **)get_static(
-                     &buffer, &buflen, sizeof(char *))) == NULL)
-                return NSS_STATUS_TRYAGAIN;
+                     &buffer, &buflen, sizeof(char *))) == NULL) {
+                nss_status = NSS_STATUS_TRYAGAIN;
+                goto out;
+        }
 
         he->h_aliases[0] = NULL;
 
-        return NSS_STATUS_SUCCESS;
+        nss_status = NSS_STATUS_SUCCESS;
+
+  out:
+
+#if HAVE_PTHREAD
+        pthread_mutex_unlock(&wins_nss_mutex);
+#endif
+        return nss_status;
 }
 
@@ -373 +407 @@
                            char *buffer, size_t buflen, int *h_errnop)
 {
+        NSS_STATUS nss_status;
+
+#if HAVE_PTHREAD
+        pthread_mutex_lock(&wins_nss_mutex);
+#endif
+
         if(af!=AF_INET) {
                 *h_errnop = NO_DATA;
-                return NSS_STATUS_UNAVAIL;
-        }
-
-        return _nss_wins_gethostbyname_r(
-                name, he, buffer, buflen, h_errnop);
-}
-#endif
+                nss_status = NSS_STATUS_UNAVAIL;
+        } else {
+                nss_status = _nss_wins_gethostbyname_r(
+                                name, he, buffer, buflen, h_errnop);
+        }
+#if HAVE_PTHREAD
+        pthread_mutex_unlock(&wins_nss_mutex);
+#endif
+        return nss_status;
+}
+#endif

branches/samba-3.0/source/param/loadparm.c

@@ -151 +151 @@
         char *szPanicAction;
         char *szAddUserScript;
-        char *szRenameUserScript;
+        char *szRenameUserScript;
         char *szDelUserScript;
         char *szAddGroupScript;
@@ -188 +188 @@
         char *szChangeShareCommand;
         char *szDeleteShareCommand;
-        char **szEventLogs;
+char **szEventLogs;
         char *szGuestaccount;
         char *szManglingMethod;
@@ -472 +472 @@
         False,                  /* not autoloaded */
         0,                      /* not a usershare */
-        (time_t)0,              /* No last mod time */
+        (time_t)0,            /* No last mod time */
         NULL,                   /* szService */
         NULL,                   /* szPath */
@@ -513 +513 @@
         NULL,                   /* fstype */
         NULL,                   /* vfs objects */
-        NULL,                   /* szMSDfsProxy */
+        NULL,              /* szMSDfsProxy */
         NULL,                   /* szAioWriteBehind */
         NULL,                   /* szDfree */
@@ -533 +533 @@
         2,                      /* iOplockContentionLimit */
         0,                      /* iCSCPolicy */
-        1024,                   /* iBlock_size */
+        1024,           /* iBlock_size */
         0,                      /* iDfreeCacheTime */
         False,                  /* bPreexecClose */
@@ -588 +588 @@
         False,                  /* bForcePrintername */
         True,                   /* bNTAclSupport */
-        False,                  /* bForceUnknownAclUser */
+        False,            /* bForceUnknownAclUser */
         False,                  /* bUseSendfile */
         False,                  /* bProfileAcls */
@@ -821 +821 @@
         {MAP_TO_GUEST_ON_BAD_USER, "Bad User"},
         {MAP_TO_GUEST_ON_BAD_PASSWORD, "Bad Password"},
-        {MAP_TO_GUEST_ON_BAD_UID, "Bad Uid"},
+        {MAP_TO_GUEST_ON_BAD_UID, "Bad Uid"},
         {-1, NULL}
 };
@@ -834 +834 @@
  *       Any parameter that does NOT have FLAG_ADVANCED will not disply at all
  *       Set FLAG_SHARE and FLAG_PRINT to specifically display parameters in
- *        respective views.
+ *      respective views.
  *
  * NOTE2: Handling of duplicated (synonym) paramters:
@@ -1122 +1122 @@
 
         {"add user script", P_STRING, P_GLOBAL, &Globals.szAddUserScript, NULL, NULL, FLAG_ADVANCED}, 
-        {"rename user script", P_STRING, P_GLOBAL, &Globals.szRenameUserScript, NULL, NULL, FLAG_ADVANCED},
+        {"rename user script", P_STRING, P_GLOBAL, &Globals.szRenameUserScript, NULL, NULL, FLAG_ADVANCED},
         {"delete user script", P_STRING, P_GLOBAL, &Globals.szDelUserScript, NULL, NULL, FLAG_ADVANCED}, 
         {"add group script", P_STRING, P_GLOBAL, &Globals.szAddGroupScript, NULL, NULL, FLAG_ADVANCED}, 
@@ -1418 +1418 @@
         pstring s;
 
-        /* If requested to initialize only once and we've already done it... */
-        if (first_time_only && done_init) {
-                /* ... then we have nothing more to do */
-                return;
-        }
+        /* If requested to initialize only once and we've already done it... */
+        if (first_time_only && done_init) {
+                /* ... then we have nothing more to do */
+                return;
+        }
 
         if (!done_init) {
@@ -1462 +1462 @@
 
 #if defined (__OS2__)
-        /* search the system codepage and set OS2CodePageStr */
-        unsigned long _System DosQueryCp (unsigned long ulLength, unsigned long *pCodePageList, unsigned long *pDataLength);
-        pstring OS2CodePageStr;
-        unsigned long OS2CodePage[3];
-        unsigned long OS2CodePageLen;
-        if ( DosQueryCp( sizeof(OS2CodePage), OS2CodePage, &OS2CodePageLen ) )
-           slprintf(OS2CodePageStr, sizeof(OS2CodePageStr) -1, "SYSTEM");
-          else
-           slprintf(OS2CodePageStr, sizeof(OS2CodePageStr) -1, "IBM-%u", OS2CodePage[0]);
+        /* search the system codepage and set OS2CodePageStr */
+        unsigned long _System DosQueryCp (unsigned long ulLength, unsigned long *pCodePageList, unsigned long *pDataLength);
+        pstring OS2CodePageStr;
+        unsigned long OS2CodePage[3];
+        unsigned long OS2CodePageLen;
+        if ( DosQueryCp( sizeof(OS2CodePage), OS2CodePage, &OS2CodePageLen ) )
+                slprintf(OS2CodePageStr, sizeof(OS2CodePageStr) -1, "SYSTEM");
+        else
+                slprintf(OS2CodePageStr, sizeof(OS2CodePageStr) -1, "IBM-%u", OS2CodePage[0]);
 #endif
 
@@ -1492 +1492 @@
            characters - default to system codepage */
         string_set(&Globals.display_charset, OS2CodePageStr);
-#endif  
+#endif
 
 #else
@@ -2238 +2238 @@
         BOOL global_section = False;
         char* param_key;
-        param_opt_struct *data;
+        param_opt_struct *data;
         
         if (snum >= iNumServices) return NULL;
@@ -2268 +2268 @@
                 data = Globals.param_opt;
                 while (data) {
-                        if (strcmp(data->key, param_key) == 0) {
-                                string_free(&param_key);
+                        if (strcmp(data->key, param_key) == 0) {
+                                string_free(&param_key);
                                 return data;
                         }
@@ -2486 +2486 @@
 {
         int i;
-        param_opt_struct *data, *pdata;
+        param_opt_struct *data, *pdata;
         if (!pservice)
                 return;
@@ -2670 +2670 @@
                 DEBUG(10,("hash_a_service: creating tdb servicehash\n"));
                 ServiceHash = tdb_open("servicehash", 1031, TDB_INTERNAL, 
-                                        (O_RDWR|O_CREAT), 0600);
+                                        (O_RDWR|O_CREAT), 0600);
                 if ( !ServiceHash ) {
                         DEBUG(0,("hash_a_service: open tdb servicehash failed!\n"));
@@ -2683 +2683 @@
                 return False;
 
-        tdb_store_int32(ServiceHash, canon_name, idx);
+        tdb_store_int32(ServiceHash, canon_name, idx);
 
         return True;

branches/samba-3.0/source/rpc_server/srv_netlog_nt.c

@@ -432 +432 @@
         DOM_CHAL srv_chal_out;
 
+        /* According to Microsoft (see bugid #6099)
+         * Windows 7 looks at the negotiate_flags
+         * returned in this structure *even if the
+         * call fails with access denied ! So in order
+         * to allow Win7 to connect to a Samba NT style
+         * PDC we set the flags before we know if it's
+         * an error or not.
+         */
+
+        srv_flgs.neg_flags = 0x000001ff;
+
+        if (lp_server_schannel() != False) {
+                srv_flgs.neg_flags |= NETLOGON_NEG_SCHANNEL;
+        }
+
+        /* set up the initial LSA AUTH 2 response */
+        ZERO_STRUCT(srv_chal_out);
+        init_net_r_auth_2(r_u, &srv_chal_out, &srv_flgs, NT_STATUS_OK);
+
         rpcstr_pull(mach_acct, q_u->clnt_id.uni_acct_name.buffer,sizeof(fstring),
                                 q_u->clnt_id.uni_acct_name.uni_str_len*2,0);
@@ -480 +499 @@
         }
 
-        srv_flgs.neg_flags = 0x000001ff;
-
-        if (lp_server_schannel() != False) {
-                srv_flgs.neg_flags |= NETLOGON_NEG_SCHANNEL;
-        }
-
-        /* set up the LSA AUTH 2 response */
+        /* set up the real LSA AUTH 2 response */
         init_net_r_auth_2(r_u, &srv_chal_out, &srv_flgs, NT_STATUS_OK);
 

branches/samba-3.0/source/rpc_server/srv_pipe.c

@@ -2063 +2063 @@
         auth_len = p->hdr.auth_len;
 
-        if (auth_len != RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN) {
+        if (auth_len < RPC_AUTH_SCHANNEL_SIGN_OR_SEAL_CHK_LEN ||
+                        auth_len > RPC_HEADER_LEN +
+                                        RPC_HDR_REQ_LEN +
+                                        RPC_HDR_AUTH_LEN +
+                                        auth_len) {
                 DEBUG(0,("Incorrect auth_len %u.\n", (unsigned int)auth_len ));
                 return False;

branches/samba-3.0/source/script/installman.sh

@@ -21 +21 @@
 # Get the configured feature set
 test -f "${SRCDIR}/config.log" && \
-        eval `grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log"`
+        eval `grep "^[[:alnum:]_]*=.*" "${SRCDIR}/config.log"`
 
 for lang in $langs; do
@@ -49 +49 @@
             # Check if this man page if required by the configured feature set
             case "${MP_BASENAME}" in
+                cifs.upcall.8) test -z "${CIFSUPCALL_PROGS}" && continue ;;
                 smbsh.1) test -z "${SMBWRAPPER}" && continue ;;
                 smbmnt.8|smbmount.8|smbumount.8) test -z "${SMBMOUNT_PROGS}" && continue ;;

branches/samba-3.0/source/smbd/lanman.c

@@ -1138 +1138 @@
                         continue;
                 }
-                if (!next_token(&ptr,s->comment, NULL, sizeof(s->comment))) {
+                if (!next_token(&ptr,s->comment, NULL,
+                                MIN(sizeof(s->comment),
+                                    MAX_SERVER_STRING_LENGTH))) {
                         continue;
                 }

branches/samba-3.0/source/smbd/posix_acls.c

@@ -3098 +3098 @@
         }
 
+        /* only allow chown to the current user. This is more secure,
+           and also copes with the case where the SID in a take ownership ACL is
+           a local SID on the users workstation
+        */
+        if (uid != current_user.ut.uid) {
+                errno = EPERM;
+                return -1;
+        }
+
         if (SMB_VFS_STAT(conn,fname,&st)) {
                 return -1;
@@ -3105 +3114 @@
                 return -1;
         }
-
-        /* only allow chown to the current user. This is more secure,
-           and also copes with the case where the SID in a take ownership ACL is
-           a local SID on the users workstation 
-        */
-        uid = current_user.ut.uid;
 
         become_root();
@@ -3339 +3342 @@
         BOOL acl_perms = False;
         mode_t orig_mode = (mode_t)0;
-        uid_t orig_uid;
-        gid_t orig_gid;
-        BOOL need_chown = False;
+        BOOL set_acl_as_root = false;
+        BOOL acl_set_support = false;
+        BOOL ret = false;
 
         DEBUG(10,("set_nt_acl: called for file %s\n", fsp->fsp_name ));
@@ -3364 +3367 @@
         /* Save the original elements we check against. */
         orig_mode = sbuf.st_mode;
-        orig_uid = sbuf.st_uid;
-        orig_gid = sbuf.st_gid;
 
         /*
@@ -3379 +3380 @@
          */
 
-        if (((user != (uid_t)-1) && (orig_uid != user)) || (( grp != (gid_t)-1) && (orig_gid != grp))) {
-                need_chown = True;
-        }
-
-        /*
-         * Chown before setting ACL only if we don't change the user, or
-         * if we change to the current user, but not if we want to give away
-         * the file.
-         */
-
-        if (need_chown && (user == (uid_t)-1 || user == current_user.ut.uid)) {
+        if (((user != (uid_t)-1) && (sbuf.st_uid != user)) || (( grp != (gid_t)-1) && (sbuf.st_gid != grp))) {
 
                 DEBUG(3,("set_nt_acl: chown %s. uid = %u, gid = %u.\n",
@@ -3411 +3402 @@
                 } else {
 
-                        int ret;
+                        int sret;
 
                         if(fsp->fh->fd == -1)
-                                ret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf);
+                                sret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf);
                         else
-                                ret = SMB_VFS_FSTAT(fsp,fsp->fh->fd,&sbuf);
-
-                        if(ret != 0)
+                                sret = SMB_VFS_FSTAT(fsp,fsp->fh->fd,&sbuf);
+
+                        if(sret != 0)
                                 return False;
                 }
@@ -3424 +3415 @@
                 /* Save the original elements we check against. */
                 orig_mode = sbuf.st_mode;
-                orig_uid = sbuf.st_uid;
-                orig_gid = sbuf.st_gid;
-
-                /* We did it, don't try again */
-                need_chown = False;
+
+                /* If we successfully chowned, we know we must
+                 * be able to set the acl, so do it as root.
+                 */
+                set_acl_as_root = true;
         }
 
         create_file_sids(&sbuf, &file_owner_sid, &file_grp_sid);
-
-#if 0
-        /* Disable this - prevents ACL inheritance from the ACL editor. JRA. */
-
-        /* See here: http://www.codeproject.com/KB/winsdk/accessctrl2.aspx
-         * for details and also the log trace in bug #4308. JRA.
-        */
-
-        if ((security_info_sent & DACL_SECURITY_INFORMATION) &&
-                psd->dacl != NULL &&
-                (psd->type & (SE_DESC_DACL_AUTO_INHERITED|
-                              SE_DESC_DACL_AUTO_INHERIT_REQ))==
-                        (SE_DESC_DACL_AUTO_INHERITED|
-                         SE_DESC_DACL_AUTO_INHERIT_REQ) ) {
-                NTSTATUS status = append_parent_acl(fsp, &sbuf, psd, &psd);
-                if (!NT_STATUS_IS_OK(status)) {
-                        return False;
-                }
-        }
-#endif
 
         acl_perms = unpack_canon_ace( fsp, &sbuf, &file_owner_sid, &file_grp_sid,
@@ -3457 +3428 @@
 
         /* Ignore W2K traverse DACL set. */
-        if (file_ace_list || dir_ace_list) {
-
-                if (!acl_perms) {
-                        DEBUG(3,("set_nt_acl: cannot set permissions\n"));
+        if (!file_ace_list && !dir_ace_list) {
+                return True;
+        }
+
+        if (!acl_perms) {
+                DEBUG(3,("set_nt_acl: cannot set permissions\n"));
+                free_canon_ace_list(file_ace_list);
+                free_canon_ace_list(dir_ace_list);
+                return False;
+        }
+
+        /*
+         * Only change security if we got a DACL.
+         */
+
+        if(!(security_info_sent & DACL_SECURITY_INFORMATION) || (psd->dacl == NULL)) {
+                free_canon_ace_list(file_ace_list);
+                free_canon_ace_list(dir_ace_list);
+                return True;
+        }
+
+        /*
+         * Try using the POSIX ACL set first. Fall back to chmod if
+         * we have no ACL support on this filesystem.
+         */
+
+        if (acl_perms && file_ace_list) {
+                if (set_acl_as_root) {
+                        become_root();
+                }
+                ret = set_canon_ace_list(fsp, file_ace_list, False, sbuf.st_gid, &acl_set_support);
+                if (set_acl_as_root) {
+                        unbecome_root();
+                }
+                if (acl_set_support && ret == False) {
+                        DEBUG(3,("set_nt_acl: failed to set file acl on file %s (%s).\n", fsp->fsp_name, strerror(errno) ));
                         free_canon_ace_list(file_ace_list);
-                        free_canon_ace_list(dir_ace_list); 
+                        free_canon_ace_list(dir_ace_list);
                         return False;
                 }
-
-                /*
-                 * Only change security if we got a DACL.
-                 */
-
-                if((security_info_sent & DACL_SECURITY_INFORMATION) && (psd->dacl != NULL)) {
-
-                        BOOL acl_set_support = False;
-                        BOOL ret = False;
+        }
+
+        if (acl_perms && acl_set_support && fsp->is_directory) {
+                if (dir_ace_list) {
+                        if (set_acl_as_root) {
+                                become_root();
+                        }
+                        ret = set_canon_ace_list(fsp, dir_ace_list, True, sbuf.st_gid, &acl_set_support);
+                        if (set_acl_as_root) {
+                                unbecome_root();
+                        }
+                        if (ret == False) {
+                                DEBUG(3,("set_nt_acl: failed to set default acl on directory %s (%s).\n", fsp->fsp_name, strerror(errno) ));
+                                free_canon_ace_list(file_ace_list);
+                                free_canon_ace_list(dir_ace_list);
+                                return False;
+                        }
+                } else {
+
+                        int sret = -1;
 
                         /*
-                         * Try using the POSIX ACL set first. Fall back to chmod if
-                         * we have no ACL support on this filesystem.
+                         * No default ACL - delete one if it exists.
                          */
 
-                        if (acl_perms && file_ace_list) {
-                                ret = set_canon_ace_list(fsp, file_ace_list, False, sbuf.st_gid, &acl_set_support);
-                                if (acl_set_support && ret == False) {
-                                        DEBUG(3,("set_nt_acl: failed to set file acl on file %s (%s).\n", fsp->fsp_name, strerror(errno) ));
+                        if (set_acl_as_root) {
+                                become_root();
+                        }
+                        sret = SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fsp->fsp_name);
+                        if (set_acl_as_root) {
+                                unbecome_root();
+                        }
+
+                        if (sret == -1) {
+                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
+                                        DEBUG(5,("set_nt_acl: acl group control on and "
+                                                "current user in file %s primary group. Override delete_def_acl\n",
+                                                fsp->fsp_name ));
+
+                                        become_root();
+                                        sret = SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fsp->fsp_name);
+                                        unbecome_root();
+                                }
+
+                                if (sret == -1) {
+                                        DEBUG(3,("set_nt_acl: sys_acl_delete_def_file failed (%s)\n", strerror(errno)));
                                         free_canon_ace_list(file_ace_list);
-                                        free_canon_ace_list(dir_ace_list); 
+                                        free_canon_ace_list(dir_ace_list);
                                         return False;
                                 }
                         }
-
-                        if (acl_perms && acl_set_support && fsp->is_directory) {
-                                if (dir_ace_list) {
-                                        if (!set_canon_ace_list(fsp, dir_ace_list, True, sbuf.st_gid, &acl_set_support)) {
-                                                DEBUG(3,("set_nt_acl: failed to set default acl on directory %s (%s).\n", fsp->fsp_name, strerror(errno) ));
-                                                free_canon_ace_list(file_ace_list);
-                                                free_canon_ace_list(dir_ace_list); 
-                                                return False;
-                                        }
-                                } else {
-
-                                        /*
-                                         * No default ACL - delete one if it exists.
-                                         */
-
-                                        if (SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fsp->fsp_name) == -1) {
-                                                int sret = -1;
-
-                                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
-                                                        DEBUG(5,("set_nt_acl: acl group control on and "
-                                                                "current user in file %s primary group. Override delete_def_acl\n",
-                                                                fsp->fsp_name ));
-
-                                                        become_root();
-                                                        sret = SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fsp->fsp_name);
-                                                        unbecome_root();
-                                                }
-
-                                                if (sret == -1) {
-                                                        DEBUG(3,("set_nt_acl: sys_acl_delete_def_file failed (%s)\n", strerror(errno)));
-                                                        free_canon_ace_list(file_ace_list);
-                                                        free_canon_ace_list(dir_ace_list);
-                                                        return False;
-                                                }
-                                        }
+                }
+        }
+
+        if (acl_set_support) {
+                if (set_acl_as_root) {
+                        become_root();
+                }
+                store_inheritance_attributes(fsp, file_ace_list, dir_ace_list,
+                                (psd->type & SE_DESC_DACL_PROTECTED) ? True : False);
+                if (set_acl_as_root) {
+                        unbecome_root();
+                }
+        }
+
+        /*
+         * If we cannot set using POSIX ACLs we fall back to checking if we need to chmod.
+         */
+
+        if(!acl_set_support && acl_perms) {
+                mode_t posix_perms;
+
+                if (!convert_canon_ace_to_posix_perms( fsp, file_ace_list, &posix_perms)) {
+                        free_canon_ace_list(file_ace_list);
+                        free_canon_ace_list(dir_ace_list);
+                        DEBUG(3,("set_nt_acl: failed to convert file acl to posix permissions for file %s.\n",
+                                fsp->fsp_name ));
+                        return False;
+                }
+
+                if (orig_mode != posix_perms) {
+                        int sret = -1;
+
+                        DEBUG(3,("set_nt_acl: chmod %s. perms = 0%o.\n",
+                                fsp->fsp_name, (unsigned int)posix_perms ));
+
+                        if (set_acl_as_root) {
+                                become_root();
+                        }
+                        sret = SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms);
+                        if (set_acl_as_root) {
+                                unbecome_root();
+                        }
+                        if(sret == -1) {
+                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
+                                        DEBUG(5,("set_nt_acl: acl group control on and "
+                                                "current user in file %s primary group. Override chmod\n",
+                                                fsp->fsp_name ));
+
+                                        become_root();
+                                        sret = SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms);
+                                        unbecome_root();
                                 }
-                        }
-
-                        if (acl_set_support) {
-                                store_inheritance_attributes(fsp, file_ace_list, dir_ace_list,
-                                                (psd->type & SE_DESC_DACL_PROTECTED) ? True : False);
-                        }
-
-                        /*
-                         * If we cannot set using POSIX ACLs we fall back to checking if we need to chmod.
-                         */
-
-                        if(!acl_set_support && acl_perms) {
-                                mode_t posix_perms;
-
-                                if (!convert_canon_ace_to_posix_perms( fsp, file_ace_list, &posix_perms)) {
+
+                                if (sret == -1) {
+                                        DEBUG(3,("set_nt_acl: chmod %s, 0%o failed. Error = %s.\n",
+                                                fsp->fsp_name, (unsigned int)posix_perms, strerror(errno) ));
                                         free_canon_ace_list(file_ace_list);
                                         free_canon_ace_list(dir_ace_list);
-                                        DEBUG(3,("set_nt_acl: failed to convert file acl to posix permissions for file %s.\n",
-                                                fsp->fsp_name ));
                                         return False;
                                 }
-
-                                if (orig_mode != posix_perms) {
-
-                                        DEBUG(3,("set_nt_acl: chmod %s. perms = 0%o.\n",
-                                                fsp->fsp_name, (unsigned int)posix_perms ));
-
-                                        if(SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms) == -1) {
-                                                int sret = -1;
-                                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
-                                                        DEBUG(5,("set_nt_acl: acl group control on and "
-                                                                "current user in file %s primary group. Override chmod\n",
-                                                                fsp->fsp_name ));
-
-                                                        become_root();
-                                                        sret = SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms);
-                                                        unbecome_root();
-                                                }
-
-                                                if (sret == -1) {
-                                                        DEBUG(3,("set_nt_acl: chmod %s, 0%o failed. Error = %s.\n",
-                                                                fsp->fsp_name, (unsigned int)posix_perms, strerror(errno) ));
-                                                        free_canon_ace_list(file_ace_list);
-                                                        free_canon_ace_list(dir_ace_list);
-                                                        return False;
-                                                }
-                                        }
-                                }
-                        }
-                }
-
-                free_canon_ace_list(file_ace_list);
-                free_canon_ace_list(dir_ace_list); 
-        }
-
-        /* Any chown pending? */
-        if (need_chown) {
-
-                DEBUG(3,("set_nt_acl: chown %s. uid = %u, gid = %u.\n",
-                        fsp->fsp_name, (unsigned int)user, (unsigned int)grp ));
-
-                if(try_chown( fsp->conn, fsp->fsp_name, user, grp) == -1) {
-                        DEBUG(3,("set_nt_acl: chown %s, %u, %u failed. Error = %s.\n",
-                                fsp->fsp_name, (unsigned int)user, (unsigned int)grp, strerror(errno) ));
-                        return False;
-                }
-        }
-
+                        }
+                }
+        }
+
+        free_canon_ace_list(file_ace_list);
+        free_canon_ace_list(dir_ace_list);
         return True;
 }
@@ -3969 +3961 @@
         SMB_ACL_T def_acl = NULL;
 
-        if (num_def_acls && !S_ISDIR(psbuf->st_mode)) {
-                DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
-                errno = EISDIR;
-                return False;
+        if (!S_ISDIR(psbuf->st_mode)) {
+                if (num_def_acls) {
+                        DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
+                        errno = EISDIR;
+                        return false;
+                } else {
+                        return true;
+                }
         }
 

branches/samba-3.0/source/smbd/server.c

@@ -1120 +1120 @@
 
         if (*lp_rootdir()) {
-                if (sys_chroot(lp_rootdir()) == 0)
-                        DEBUG(2,("Changed root to %s\n", lp_rootdir()));
+                if (sys_chroot(lp_rootdir()) != 0) {
+                        DEBUG(0,("Failed to change root to %s\n", lp_rootdir()));
+                        exit(1);
+                }
+                if (chdir("/") == -1) {
+                        DEBUG(0,("Failed to chdir to / on chroot to %s\n", lp_rootdir()));
+                        exit(1);
+                }
+                DEBUG(0,("Changed root to %s\n", lp_rootdir()));
         }
 

branches/samba-3.0/source/smbd/trans2.c

@@ -5482 +5482 @@
         } else if((wire_open_mode & SMB_O_CREAT) == SMB_O_CREAT) {
                 create_disp = FILE_OPEN_IF;
+        } else if ((wire_open_mode & (SMB_O_CREAT | SMB_O_EXCL | SMB_O_TRUNC)) == 0) {
+                create_disp = FILE_OPEN;
         } else {
                 DEBUG(5,("smb_posix_open: invalid create mode 0x%x\n",