Changeset 732 for branches/samba-3.5.x/source3

Timestamp:

Nov 12, 2012, 4:35:55 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.12

Location:

branches/samba-3.5.x/source3

Files:

• Makefile.in (modified) (1 diff)
• VERSION (modified) (1 diff)
• build.cmd (modified) (5 diffs)
• client/client.c (modified) (3 diffs)
• include/local.h (modified) (1 diff)
• include/proto.h (modified) (6 diffs)
• include/smb.h (modified) (1 diff)
• lib/netapi/netapi.c (modified) (3 diffs)
• lib/util.c (modified) (1 diff)
• libnet/libnet_join.c (modified) (6 diffs)
• libsmb/cliconnect.c (modified) (4 diffs)
• libsmb/clifile.c (modified) (6 diffs)
• locking/locking.c (modified) (1 diff)
• modules/vfs_acl_common.c (modified) (5 diffs)
• nmbd/nmbd_packets.c (modified) (2 diffs)
• param/loadparm.c (modified) (4 diffs)
• rpc_server/srv_wkssvc_nt.c (modified) (2 diffs)
• smbd/filename.c (modified) (4 diffs)
• smbd/msdfs.c (modified) (2 diffs)
• smbd/nttrans.c (modified) (3 diffs)
• smbd/open.c (modified) (4 diffs)
• smbd/posix_acls.c (modified) (11 diffs)
• smbd/process.c (modified) (1 diff)
• smbd/reply.c (modified) (3 diffs)
• smbd/statcache.c (modified) (4 diffs)
• smbd/trans2.c (modified) (7 diffs)
• web/swat.c (modified) (2 diffs)
• winbindd/wb_group_members.c (modified) (1 diff)
• winbindd/winbindd.c (modified) (1 diff)
• winbindd/winbindd_dual.c (modified) (4 diffs)
• winbindd/winbindd_pam.c (modified) (4 diffs)

branches/samba-3.5.x/source3/Makefile.in

@@ -29 +29 @@
 
 ## Dynamic shared libraries build settings
-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
+DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's:\.@SHLIBEXT@[\.0-9]*$$:.@SYMSEXT@:'`
 DSO_EXPORTS=@DSO_EXPORTS@
 SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@

branches/samba-3.5.x/source3/VERSION

@@ -26 +26 @@
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=5
-SAMBA_VERSION_RELEASE=11
+SAMBA_VERSION_RELEASE=12
 
 ########################################################

branches/samba-3.5.x/source3/build.cmd

@@ -15 +15 @@
 /* version 0.3.7 from 23.04.2012 Silvan (compile and link flags need to be
                                          set here [happy birthday Jason]) */
+/* version 0.3.8 from 09.11.2012 Silvan (eliminated the 2nd brand function) */
                                          
 /* load the sysfuncs if not already loaded */
@@ -24 +25 @@
 
 /* init the version string (don't forget to change) */
-version = "0.3.7"
-version_date = "23.04.2012"
+version = "0.3.8"
+version_date = "09.11.2012"
 
 /* number of make jobs to execute at the same time */
@@ -112 +113 @@
 end
 
+say "Building with: " || build_parms
+say
 ok = SysFileTree(".\include\version.h",versionh.,'FO')
 
-if versionh.0 = 0 & conf = "YES" then do
+if (versionh.0 = 0 & conf = "YES") | (brand = "YES") then do
     svninfo = ".\svninfo"
     address cmd 'svn status -q -u | grep "^Status against revision:" | sed -e "s/Status against revision: *//">'svninfo
@@ -159 +162 @@
 end
 
-if brand = "YES" then do
-    svninfo = ".\svninfo"
-    address cmd 'svn status -q -u | grep "^Status against revision:" | sed -e "s/Status against revision: *//">'svninfo
-    revision = strip(translate(linein(svninfo)))
-    ok = stream(svninfo,'c','close')
-    call brand revision
-end
-
 if make <> "" then do
-    say build_parms
     address cmd 'make -j 'jobs' 2>&1 | tee build.log'
 end
@@ -257 +251 @@
     ok = SysFileDelete(NewVersion)
     verstring = suffix'-'Major'.'minor'.'release'.'revision'-'vendor'-'date('S')
-    say "Samba "verstring
+    say "Samba branded as: "verstring
+    say
 return
 

branches/samba-3.5.x/source3/client/client.c

@@ -1669 +1669 @@
         if (!NT_STATUS_IS_OK(status)) {
                 d_fprintf(stderr, "cli_push returned %s\n", nt_errstr(status));
+                rc = 1;
         }
 
@@ -1701 +1702 @@
         if (f == x_stdin) {
                 cli_shutdown(cli);
-                exit(0);
+                exit(rc);
         }
 
@@ -2305 +2306 @@
 
         if (!NT_STATUS_IS_OK(cli_posix_open(targetcli, targetname, O_CREAT|O_RDWR, mode, &fnum))) {
-                if (!NT_STATUS_IS_OK(cli_posix_open(targetcli, targetname, O_CREAT|O_RDONLY, mode, &fnum))) {
-                        d_printf("posix_open file %s: for read/write fnum %d\n", targetname, fnum);
+                if (NT_STATUS_IS_OK(cli_posix_open(targetcli, targetname, O_CREAT|O_RDONLY, mode, &fnum))) {
+                        d_printf("posix_open file %s: for readonly fnum %d\n", targetname, fnum);
                 } else {
                         d_printf("Failed to open file %s. %s\n", targetname, cli_errstr(cli));

branches/samba-3.5.x/source3/include/local.h

@@ -241 +241 @@
 #define WINBIND_SERVER_MUTEX_WAIT_TIME (( ((NUM_CLI_AUTH_CONNECT_RETRIES) * ((CLI_AUTH_TIMEOUT)/1000)) + 5)*2)
 
-/* Max number of simultaneous winbindd socket connections. */
-#define WINBINDD_MAX_SIMULTANEOUS_CLIENTS 200
-
 /* Buffer size to use when printing backtraces */
 #define BACKTRACE_STACK_SIZE 64

branches/samba-3.5.x/source3/include/proto.h

@@ -1243 +1243 @@
                               struct tevent_context *ev,
                               NTSTATUS *status);
+bool is_executable(const char *fname);
+bool map_open_params_to_ntcreate(const char *smb_base_fname,
+                                 int deny_mode, int open_func,
+                                 uint32 *paccess_mask,
+                                 uint32 *pshare_mode,
+                                 uint32 *pcreate_disposition,
+                                 uint32 *pcreate_options);
 
 /* The following definitions come from lib/util_file.c  */
@@ -4258 +4265 @@
 int lp_winbind_cache_time(void);
 int lp_winbind_reconnect_delay(void);
+int lp_winbind_max_clients(void);
 const char **lp_winbind_nss_info(void);
 int lp_algorithmic_rid_base(void);
@@ -6347 +6355 @@
                       struct smb_filename **smb_fname,
                       uint32_t ucf_flags);
+NTSTATUS check_veto_path(connection_struct *conn, const char *name);
 NTSTATUS check_name(connection_struct *conn, const char *name);
 int get_real_filename(connection_struct *conn, const char *path,
@@ -6609 +6618 @@
                                     const char *fname,
                                     SMB_STRUCT_STAT *psbuf);
-bool is_executable(const char *fname);
 bool is_stat_open(uint32 access_mask);
 bool request_timed_out(struct timeval request_time,
@@ -6629 +6637 @@
                          uint32 share_access,
                          uint32 create_options);
-bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname,
-                                 int deny_mode, int open_func,
-                                 uint32 *paccess_mask,
-                                 uint32 *pshare_mode,
-                                 uint32 *pcreate_disposition,
-                                 uint32 *pcreate_options);
 NTSTATUS open_file_fchmod(connection_struct *conn,
                           struct smb_filename *smb_fname,
@@ -7054 +7056 @@
                 bool case_sensitive);
 bool stat_cache_lookup(connection_struct *conn,
+                        bool posix_paths,
                         char **pp_name,
                         char **pp_dirpath,

branches/samba-3.5.x/source3/include/smb.h

@@ -1958 +1958 @@
 #define UCF_COND_ALLOW_WCARD_LCOMP      0x00000004
 #define UCF_POSIX_PATHNAMES             0x00000008
+#define UCF_UNIX_NAME_LOOKUP            0x00000010
 
 /*

branches/samba-3.5.x/source3/lib/netapi/netapi.c

@@ -56 +56 @@
         NET_API_STATUS status;
         struct libnetapi_ctx *ctx = NULL;
-        char *krb5_cc_env = NULL;
 
         if (stat_ctx && libnetapi_initialized) {
@@ -101 +100 @@
 
         BlockSignals(True, SIGPIPE);
-
-        krb5_cc_env = getenv(KRB5_ENV_CCNAME);
-        if (!krb5_cc_env || (strlen(krb5_cc_env) == 0)) {
-                ctx->krb5_cc_env = talloc_strdup(frame, "MEMORY:libnetapi");
-                setenv(KRB5_ENV_CCNAME, ctx->krb5_cc_env, 1);
-        }
 
         if (getenv("USER")) {
@@ -251 +244 @@
 }
 
+/****************************************************************
+****************************************************************/
+
 NET_API_STATUS libnetapi_set_use_ccache(struct libnetapi_ctx *ctx)
 {

branches/samba-3.5.x/source3/lib/util.c

@@ -3076 +3076 @@
         return ret;
 }
+
+/*******************************************************************
+ Return True if the filename is one of the special executable types.
+********************************************************************/
+
+bool is_executable(const char *fname)
+{
+        if ((fname = strrchr_m(fname,'.'))) {
+                if (strequal(fname,".com") ||
+                    strequal(fname,".dll") ||
+                    strequal(fname,".exe") ||
+                    strequal(fname,".sym")) {
+                        return True;
+                }
+        }
+        return False;
+}
+
+/****************************************************************************
+ Open a file with a share mode - old openX method - map into NTCreate.
+****************************************************************************/
+
+bool map_open_params_to_ntcreate(const char *smb_base_fname,
+                                 int deny_mode, int open_func,
+                                 uint32 *paccess_mask,
+                                 uint32 *pshare_mode,
+                                 uint32 *pcreate_disposition,
+                                 uint32 *pcreate_options)
+{
+        uint32 access_mask;
+        uint32 share_mode;
+        uint32 create_disposition;
+        uint32 create_options = FILE_NON_DIRECTORY_FILE;
+
+        DEBUG(10,("map_open_params_to_ntcreate: fname = %s, deny_mode = 0x%x, "
+                  "open_func = 0x%x\n",
+                  smb_base_fname, (unsigned int)deny_mode,
+                  (unsigned int)open_func ));
+
+        /* Create the NT compatible access_mask. */
+        switch (GET_OPENX_MODE(deny_mode)) {
+                case DOS_OPEN_EXEC: /* Implies read-only - used to be FILE_READ_DATA */
+                case DOS_OPEN_RDONLY:
+                        access_mask = FILE_GENERIC_READ;
+                        break;
+                case DOS_OPEN_WRONLY:
+                        access_mask = FILE_GENERIC_WRITE;
+                        break;
+                case DOS_OPEN_RDWR:
+                case DOS_OPEN_FCB:
+                        access_mask = FILE_GENERIC_READ|FILE_GENERIC_WRITE;
+                        break;
+                default:
+                        DEBUG(10,("map_open_params_to_ntcreate: bad open mode = 0x%x\n",
+                                  (unsigned int)GET_OPENX_MODE(deny_mode)));
+                        return False;
+        }
+
+        /* Create the NT compatible create_disposition. */
+        switch (open_func) {
+                case OPENX_FILE_EXISTS_FAIL|OPENX_FILE_CREATE_IF_NOT_EXIST:
+                        create_disposition = FILE_CREATE;
+                        break;
+
+                case OPENX_FILE_EXISTS_OPEN:
+                        create_disposition = FILE_OPEN;
+                        break;
+
+                case OPENX_FILE_EXISTS_OPEN|OPENX_FILE_CREATE_IF_NOT_EXIST:
+                        create_disposition = FILE_OPEN_IF;
+                        break;
+
+                case OPENX_FILE_EXISTS_TRUNCATE:
+                        create_disposition = FILE_OVERWRITE;
+                        break;
+
+                case OPENX_FILE_EXISTS_TRUNCATE|OPENX_FILE_CREATE_IF_NOT_EXIST:
+                        create_disposition = FILE_OVERWRITE_IF;
+                        break;
+
+                default:
+                        /* From samba4 - to be confirmed. */
+                        if (GET_OPENX_MODE(deny_mode) == DOS_OPEN_EXEC) {
+                                create_disposition = FILE_CREATE;
+                                break;
+                        }
+                        DEBUG(10,("map_open_params_to_ntcreate: bad "
+                                  "open_func 0x%x\n", (unsigned int)open_func));
+                        return False;
+        }
+
+        /* Create the NT compatible share modes. */
+        switch (GET_DENY_MODE(deny_mode)) {
+                case DENY_ALL:
+                        share_mode = FILE_SHARE_NONE;
+                        break;
+
+                case DENY_WRITE:
+                        share_mode = FILE_SHARE_READ;
+                        break;
+
+                case DENY_READ:
+                        share_mode = FILE_SHARE_WRITE;
+                        break;
+
+                case DENY_NONE:
+                        share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE;
+                        break;
+
+                case DENY_DOS:
+                        create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_DOS;
+                        if (is_executable(smb_base_fname)) {
+                                share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE;
+                        } else {
+                                if (GET_OPENX_MODE(deny_mode) == DOS_OPEN_RDONLY) {
+                                        share_mode = FILE_SHARE_READ;
+                                } else {
+                                        share_mode = FILE_SHARE_NONE;
+                                }
+                        }
+                        break;
+
+                case DENY_FCB:
+                        create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_FCB;
+                        share_mode = FILE_SHARE_NONE;
+                        break;
+
+                default:
+                        DEBUG(10,("map_open_params_to_ntcreate: bad deny_mode 0x%x\n",
+                                (unsigned int)GET_DENY_MODE(deny_mode) ));
+                        return False;
+        }
+
+        DEBUG(10,("map_open_params_to_ntcreate: file %s, access_mask = 0x%x, "
+                  "share_mode = 0x%x, create_disposition = 0x%x, "
+                  "create_options = 0x%x\n",
+                  smb_base_fname,
+                  (unsigned int)access_mask,
+                  (unsigned int)share_mode,
+                  (unsigned int)create_disposition,
+                  (unsigned int)create_options ));
+
+        if (paccess_mask) {
+                *paccess_mask = access_mask;
+        }
+        if (pshare_mode) {
+                *pshare_mode = share_mode;
+        }
+        if (pcreate_disposition) {
+                *pcreate_disposition = create_disposition;
+        }
+        if (pcreate_options) {
+                *pcreate_options = create_options;
+        }
+
+        return True;
+
+}

branches/samba-3.5.x/source3/libnet/libnet_join.c

@@ -1621 +1621 @@
 static int libnet_destroy_JoinCtx(struct libnet_JoinCtx *r)
 {
-        const char *krb5_cc_env = NULL;
-
         if (r->in.ads) {
                 ads_destroy(&r->in.ads);
         }
 
-        krb5_cc_env = getenv(KRB5_ENV_CCNAME);
-        if (krb5_cc_env && StrCaseCmp(krb5_cc_env, "MEMORY:libnetjoin")) {
-                unsetenv(KRB5_ENV_CCNAME);
-        }
-
         return 0;
 }
@@ -1640 +1633 @@
 static int libnet_destroy_UnjoinCtx(struct libnet_UnjoinCtx *r)
 {
-        const char *krb5_cc_env = NULL;
-
         if (r->in.ads) {
                 ads_destroy(&r->in.ads);
         }
 
-        krb5_cc_env = getenv(KRB5_ENV_CCNAME);
-        if (krb5_cc_env && StrCaseCmp(krb5_cc_env, "MEMORY:libnetjoin")) {
-                unsetenv(KRB5_ENV_CCNAME);
-        }
-
         return 0;
 }
@@ -1661 +1647 @@
 {
         struct libnet_JoinCtx *ctx;
-        const char *krb5_cc_env = NULL;
 
         ctx = talloc_zero(mem_ctx, struct libnet_JoinCtx);
@@ -1673 +1658 @@
         W_ERROR_HAVE_NO_MEMORY(ctx->in.machine_name);
 
-        krb5_cc_env = getenv(KRB5_ENV_CCNAME);
-        if (!krb5_cc_env || (strlen(krb5_cc_env) == 0)) {
-                krb5_cc_env = talloc_strdup(mem_ctx, "MEMORY:libnetjoin");
-                W_ERROR_HAVE_NO_MEMORY(krb5_cc_env);
-                setenv(KRB5_ENV_CCNAME, krb5_cc_env, 1);
-        }
-
         ctx->in.secure_channel_type = SEC_CHAN_WKSTA;
 
@@ -1694 +1672 @@
 {
         struct libnet_UnjoinCtx *ctx;
-        const char *krb5_cc_env = NULL;
 
         ctx = talloc_zero(mem_ctx, struct libnet_UnjoinCtx);
@@ -1705 +1682 @@
         ctx->in.machine_name = talloc_strdup(mem_ctx, global_myname());
         W_ERROR_HAVE_NO_MEMORY(ctx->in.machine_name);
-
-        krb5_cc_env = getenv(KRB5_ENV_CCNAME);
-        if (!krb5_cc_env || (strlen(krb5_cc_env) == 0)) {
-                krb5_cc_env = talloc_strdup(mem_ctx, "MEMORY:libnetjoin");
-                W_ERROR_HAVE_NO_MEMORY(krb5_cc_env);
-                setenv(KRB5_ENV_CCNAME, krb5_cc_env, 1);
-        }
 
         *r = ctx;

branches/samba-3.5.x/source3/libsmb/cliconnect.c

@@ -1075 +1075 @@
                         if (dest_realm) {
                                 realm = SMB_STRDUP(dest_realm);
+                                if (!realm) {
+                                        return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+                                }
                                 strupper_m(realm);
                         } else {
@@ -1086 +1089 @@
                         }
 
-                        if (realm && *realm) {
-                                principal = talloc_asprintf(talloc_tos(),
-                                                            "cifs/%s@%s",
-                                                            cli->desthost,
-                                                            realm);
-                                if (!principal) {
-                                        SAFE_FREE(realm);
+                        if (realm == NULL || *realm == '\0') {
+                                realm = SMB_STRDUP(lp_realm());
+                                if (!realm) {
                                         return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
                                 }
-                                DEBUG(3,("cli_session_setup_spnego: guessed "
-                                        "server principal=%s\n",
-                                        principal ? principal : "<null>"));
+                                strupper_m(realm);
+                                DEBUG(3,("cli_session_setup_spnego: cannot "
+                                        "get realm from dest_realm %s, "
+                                        "desthost %s. Using default "
+                                        "smb.conf realm %s\n",
+                                        dest_realm ? dest_realm : "<null>",
+                                        cli->desthost,
+                                        realm));
                         }
+
+                        principal = talloc_asprintf(talloc_tos(),
+                                                    "cifs/%s@%s",
+                                                    cli->desthost,
+                                                    realm);
+                        if (!principal) {
+                                SAFE_FREE(realm);
+                                return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+                        }
+                        DEBUG(3,("cli_session_setup_spnego: guessed "
+                                "server principal=%s\n",
+                                principal ? principal : "<null>"));
+
                         SAFE_FREE(realm);
                 }
@@ -1700 +1717 @@
                 struct timespec ts;
                 bool negotiated_smb_signing = false;
+
+                if (wct != 0x11) {
+                        tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                        return;
+                }
 
                 /* NT protocol */
@@ -1766 +1788 @@
 
         } else if (cli->protocol >= PROTOCOL_LANMAN1) {
+                if (wct != 0x0D) {
+                        tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                        return;
+                }
+
                 cli->use_spnego = False;
                 cli->sec_mode = SVAL(vwv + 1, 0);

branches/samba-3.5.x/source3/libsmb/clifile.c

@@ -2150 +2150 @@
 
 struct cli_open_state {
+        struct tevent_context *ev;
+        struct cli_state *cli;
+        const char *fname;
         uint16_t vwv[15];
         uint16_t fnum;
+        unsigned openfn;
+        unsigned dos_deny;
+        uint8_t additional_flags;
         struct iovec bytes;
 };
 
 static void cli_open_done(struct tevent_req *subreq);
+static void cli_open_ntcreate_done(struct tevent_req *subreq);
 
 struct tevent_req *cli_open_create(TALLOC_CTX *mem_ctx,
@@ -2165 +2172 @@
         struct tevent_req *req, *subreq;
         struct cli_open_state *state;
-        unsigned openfn;
-        unsigned accessmode;
-        uint8_t additional_flags;
         uint8_t *bytes;
 
@@ -2174 +2178 @@
                 return NULL;
         }
-
-        openfn = 0;
+        state->ev = ev;
+        state->cli = cli;
+        state->fname = fname;
+
         if (flags & O_CREAT) {
-                openfn |= (1<<4);
+                state->openfn |= (1<<4);
         }
         if (!(flags & O_EXCL)) {
                 if (flags & O_TRUNC)
-                        openfn |= (1<<1);
+                        state->openfn |= (1<<1);
                 else
-                        openfn |= (1<<0);
-        }
-
-        accessmode = (share_mode<<4);
+                        state->openfn |= (1<<0);
+        }
+
+        state->dos_deny = (share_mode<<4);
 
         if ((flags & O_ACCMODE) == O_RDWR) {
-                accessmode |= 2;
+                state->dos_deny |= 2;
         } else if ((flags & O_ACCMODE) == O_WRONLY) {
-                accessmode |= 1;
+                state->dos_deny |= 1;
         }
 
 #if defined(O_SYNC)
         if ((flags & O_SYNC) == O_SYNC) {
-                accessmode |= (1<<14);
+                state->dos_deny |= (1<<14);
         }
 #endif /* O_SYNC */
 
         if (share_mode == DENY_FCB) {
-                accessmode = 0xFF;
+                state->dos_deny = 0xFF;
         }
 
@@ -2208 +2214 @@
         SSVAL(state->vwv + 1, 0, 0);
         SSVAL(state->vwv + 2, 0, 0);  /* no additional info */
-        SSVAL(state->vwv + 3, 0, accessmode);
+        SSVAL(state->vwv + 3, 0, state->dos_deny);
         SSVAL(state->vwv + 4, 0, aSYSTEM | aHIDDEN);
         SSVAL(state->vwv + 5, 0, 0);
         SIVAL(state->vwv + 6, 0, 0);
-        SSVAL(state->vwv + 8, 0, openfn);
+        SSVAL(state->vwv + 8, 0, state->openfn);
         SIVAL(state->vwv + 9, 0, 0);
         SIVAL(state->vwv + 11, 0, 0);
         SIVAL(state->vwv + 13, 0, 0);
 
-        additional_flags = 0;
-
         if (cli->use_oplocks) {
                 /* if using oplocks then ask for a batch oplock via
                    core and extended methods */
-                additional_flags =
+                state->additional_flags =
                         FLAG_REQUEST_OPLOCK|FLAG_REQUEST_BATCH_OPLOCK;
                 SSVAL(state->vwv+2, 0, SVAL(state->vwv+2, 0) | 6);
@@ -2238 +2242 @@
         state->bytes.iov_len = talloc_get_size(bytes);
 
-        subreq = cli_smb_req_create(state, ev, cli, SMBopenX, additional_flags,
+        subreq = cli_smb_req_create(state, ev, cli, SMBopenX,
+                                    state->additional_flags,
                                     15, state->vwv, 1, &state->bytes);
         if (subreq == NULL) {
@@ -2279 +2284 @@
         uint16_t *vwv;
         NTSTATUS status;
+        uint32_t access_mask, share_mode, create_disposition, create_options;
 
         status = cli_smb_recv(subreq, 3, &wct, &vwv, NULL, NULL);
-        if (!NT_STATUS_IS_OK(status)) {
-                TALLOC_FREE(subreq);
+        TALLOC_FREE(subreq);
+
+        if (NT_STATUS_IS_OK(status)) {
+                state->fnum = SVAL(vwv+2, 0);
+                tevent_req_done(req);
+                return;
+        }
+
+        if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
                 tevent_req_nterror(req, status);
                 return;
         }
-        state->fnum = SVAL(vwv+2, 0);
+
+        /*
+         * For the new shiny OS/X Lion SMB server, try a ntcreate
+         * fallback.
+         */
+
+        if (!map_open_params_to_ntcreate(state->fname, state->dos_deny,
+                                        state->openfn, &access_mask,
+                                        &share_mode, &create_disposition,
+                                        &create_options)) {
+                tevent_req_nterror(req, NT_STATUS_NOT_SUPPORTED);
+                return;
+        }
+
+        subreq = cli_ntcreate_send(state, state->ev, state->cli,
+                                state->fname, 0, access_mask,
+                                0, share_mode, create_disposition,
+                                create_options, 0);
+        if (tevent_req_nomem(subreq, req)) {
+                return;
+        }
+        tevent_req_set_callback(subreq, cli_open_ntcreate_done, req);
+}
+
+static void cli_open_ntcreate_done(struct tevent_req *subreq)
+{
+        struct tevent_req *req = tevent_req_callback_data(
+                subreq, struct tevent_req);
+        struct cli_open_state *state = tevent_req_data(
+                req, struct cli_open_state);
+        NTSTATUS status;
+
+        status = cli_ntcreate_recv(subreq, &state->fnum);
+        TALLOC_FREE(subreq);
+
+        if (!NT_STATUS_IS_OK(status)) {
+                tevent_req_nterror(req, status);
+                return;
+        }
         tevent_req_done(req);
 }

branches/samba-3.5.x/source3/locking/locking.c

@@ -1351 +1351 @@
         if (fsp->is_directory) {
                 SMB_ASSERT(!is_ntfs_stream_smb_fname(fsp->fsp_name));
+
+                /* Or the root of a share. */
+                if (ISDOT(fsp->fsp_name->base_name)) {
+                        DEBUG(10,("can_set_delete_on_close: can't set delete on "
+                                  "close for the root of a share.\n"));
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+
                 return can_delete_directory(fsp->conn,
                                             fsp->fsp_name->base_name);

branches/samba-3.5.x/source3/modules/vfs_acl_common.c

@@ -248 +248 @@
                                 struct security_descriptor **ppdesc)
 {
-        DATA_BLOB blob;
+        DATA_BLOB blob = data_blob_null;
         NTSTATUS status;
         uint16_t hash_type;
@@ -826 +826 @@
         struct smb_filename local_fname;
         int saved_errno = 0;
+        char *saved_dir = NULL;
+
+        saved_dir = vfs_GetWd(talloc_tos(),conn);
+        if (!saved_dir) {
+                saved_errno = errno;
+                goto out;
+        }
 
         if (!parent_dirname(talloc_tos(), path,
@@ -838 +845 @@
 
         /* cd into the parent dir to pin it. */
-        ret = SMB_VFS_CHDIR(conn, parent_dir);
+        ret = vfs_ChDir(conn, parent_dir);
         if (ret == -1) {
                 saved_errno = errno;
@@ -856 +863 @@
         /* Ensure we have this file open with DELETE access. */
         id = vfs_file_id_from_sbuf(conn, &local_fname.st);
-        for (fsp = file_find_di_first(id); fsp; file_find_di_next(fsp)) {
+        for (fsp = file_find_di_first(id); fsp; fsp = file_find_di_next(fsp)) {
                 if (fsp->access_mask & DELETE_ACCESS &&
                                 fsp->delete_on_close) {
@@ -891 +898 @@
         TALLOC_FREE(parent_dir);
 
-        vfs_ChDir(conn, conn->connectpath);
+        if (saved_dir) {
+                vfs_ChDir(conn, saved_dir);
+        }
         if (saved_errno) {
                 errno = saved_errno;

branches/samba-3.5.x/source3/nmbd/nmbd_packets.c

@@ -1716 +1716 @@
                 errno = EBADF;
                 SAFE_FREE(pset);
+                SAFE_FREE(sock_array);
                 return True;
         }
@@ -1753 +1754 @@
                 errno = EBADF;
                 SAFE_FREE(pset);
+                SAFE_FREE(sock_array);
                 return True;
         }

branches/samba-3.5.x/source3/param/loadparm.c

@@ -255 +255 @@
         int winbind_cache_time;
         int winbind_reconnect_delay;
-        int winbind_max_idle_children;
+        int winbind_max_clients;
         char **szWinbindNssInfo;
         int iLockSpinTime;
@@ -4556 +4556 @@
         },
         {
+                .label          = "winbind max clients",
+                .type           = P_INTEGER,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.winbind_max_clients,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
+        {
                 .label          = "winbind enum users",
                 .type           = P_BOOL,
@@ -5223 +5232 @@
         Globals.winbind_cache_time = 300;       /* 5 minutes */
         Globals.winbind_reconnect_delay = 30;   /* 30 seconds */
+        Globals.winbind_max_clients = 200;
         Globals.bWinbindEnumUsers = False;
         Globals.bWinbindEnumGroups = False;
@@ -5790 +5800 @@
 FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time)
 FN_GLOBAL_INTEGER(lp_winbind_reconnect_delay, &Globals.winbind_reconnect_delay)
+FN_GLOBAL_INTEGER(lp_winbind_max_clients, &Globals.winbind_max_clients)
 FN_GLOBAL_LIST(lp_winbind_nss_info, &Globals.szWinbindNssInfo)
 FN_GLOBAL_INTEGER(lp_algorithmic_rid_base, &Globals.AlgorithmicRidBase)

branches/samba-3.5.x/source3/rpc_server/srv_wkssvc_nt.c

@@ -846 +846 @@
 
         become_root();
+        setenv(KRB5_ENV_CCNAME, "MEMORY:_wkssvc_NetrJoinDomain2", 1);
         werr = libnet_Join(p->mem_ctx, j);
+        unsetenv(KRB5_ENV_CCNAME);
         unbecome_root();
 
@@ -912 +914 @@
 
         become_root();
+        setenv(KRB5_ENV_CCNAME, "MEMORY:_wkssvc_NetrUnjoinDomain2", 1);
         werr = libnet_Unjoin(p->mem_ctx, u);
+        unsetenv(KRB5_ENV_CCNAME);
         unbecome_root();
 

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

@@ -296 +296 @@
         if((!conn->case_sensitive || !(conn->fs_capabilities &
                                        FILE_CASE_SENSITIVE_SEARCH)) &&
-            stat_cache_lookup(conn, &smb_fname->base_name, &dirpath, &start,
+            stat_cache_lookup(conn, posix_pathnames, &smb_fname->base_name, &dirpath, &start,
                               &smb_fname->st)) {
                 goto done;
@@ -840 +840 @@
 
 /****************************************************************************
+ Ensure a path is not vetod.
+****************************************************************************/
+
+NTSTATUS check_veto_path(connection_struct *conn, const char *name)
+{
+        if (IS_VETO_PATH(conn, name))  {
+                /* Is it not dot or dot dot. */
+                if (!(ISDOT(name) || ISDOTDOT(name))) {
+                        DEBUG(5,("check_veto_path: file path name %s vetoed\n",
+                                                name));
+                        return map_nt_error_from_unix(ENOENT);
+                }
+        }
+        return NT_STATUS_OK;
+}
+
+/****************************************************************************
  Check a filename - possibly calling check_reduced_name.
  This is called by every routine before it allows an operation on a filename.
@@ -848 +865 @@
 NTSTATUS check_name(connection_struct *conn, const char *name)
 {
-        if (IS_VETO_PATH(conn, name))  {
-                /* Is it not dot or dot dot. */
-                if (!((name[0] == '.') && (!name[1] ||
-                                        (name[1] == '.' && !name[2])))) {
-                        DEBUG(5,("check_name: file path name %s vetoed\n",
-                                                name));
-                        return map_nt_error_from_unix(ENOENT);
-                }
+        NTSTATUS status = check_veto_path(conn, name);
+
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
         }
 
         if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
-                NTSTATUS status = check_reduced_name(conn,name);
+                status = check_reduced_name(conn,name);
                 if (!NT_STATUS_IS_OK(status)) {
                         DEBUG(5,("check_name: name %s failed with %s\n",name,
@@ -1177 +1190 @@
         }
 
+        if ((ucf_flags & UCF_UNIX_NAME_LOOKUP) &&
+                        VALID_STAT((*pp_smb_fname)->st) &&
+                        S_ISLNK((*pp_smb_fname)->st.st_ex_mode)) {
+                return check_veto_path(conn, (*pp_smb_fname)->base_name);
+        }
+
         status = check_name(conn, (*pp_smb_fname)->base_name);
         if (!NT_STATUS_IS_OK(status)) {

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

@@ -526 +526 @@
 
         /*
-         * Note the unix path conversion here we're doing we can
+         * Note the unix path conversion here we're doing we
          * throw away. We're looking for a symlink for a dfs
          * resolution, if we don't find it we'll do another
          * unix_convert later in the codepath.
-         * If we needed to remember what we'd resolved in
-         * dp->reqpath (as the original code did) we'd
-         * copy (localhost, dp->reqpath) on any code
-         * path below that returns True - but I don't
-         * think this is needed. JRA.
          */
 
@@ -545 +540 @@
                         return status;
                 }
-
-                /* Create an smb_fname to use below. */
-                status = create_synthetic_smb_fname(ctx, pdp->reqpath, NULL,
-                                                    NULL, &smb_fname);
-                if (!NT_STATUS_IS_OK(status)) {
+                if (smb_fname == NULL || smb_fname->base_name == NULL) {
                         return status;
                 }

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

@@ -861 +861 @@
         /* Ensure we have at least one thing set. */
         if ((security_info_sent & (SECINFO_OWNER|SECINFO_GROUP|SECINFO_DACL|SECINFO_SACL)) == 0) {
+                if (security_info_sent & SECINFO_LABEL) {
+                        /* Only consider SECINFO_LABEL if no other
+                           bits are set. Just like W2K3 we don't
+                           store this. */
+                        return NT_STATUS_OK;
+                }
                 return NT_STATUS_INVALID_PARAMETER;
         }
@@ -1850 +1856 @@
         }
 
+        if (security_info_wanted & (SECINFO_DACL|SECINFO_OWNER|
+                        SECINFO_GROUP|SECINFO_SACL)) {
+                /* Don't return SECINFO_LABEL if anything else was
+                   requested. See bug #8458. */
+                security_info_wanted &= ~SECINFO_LABEL;
+        }
+
         if (!lp_nt_acl_support(SNUM(conn))) {
+                status = get_null_nt_acl(talloc_tos(), &psd);
+        } else if (security_info_wanted & SECINFO_LABEL) {
+                /* Like W2K3 return a null object. */
                 status = get_null_nt_acl(talloc_tos(), &psd);
         } else {
@@ -1882 +1898 @@
             security_info_wanted & DACL_SECURITY_INFORMATION)
                 psd->type |= SEC_DESC_DACL_PRESENT;
+
+        if (security_info_wanted & SECINFO_LABEL) {
+                /* Like W2K3 return a null object. */
+                psd->owner_sid = NULL;
+                psd->group_sid = NULL;
+                psd->dacl = NULL;
+                psd->sacl = NULL;
+                psd->type &= ~(SEC_DESC_DACL_PRESENT|SEC_DESC_SACL_PRESENT);
+        }
 
         sd_size = ndr_size_security_descriptor(psd, NULL, 0);

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

@@ -661 +661 @@
 }
 
-/*******************************************************************
- Return True if the filename is one of the special executable types.
-********************************************************************/
-
-bool is_executable(const char *fname)
-{
-        if ((fname = strrchr_m(fname,'.'))) {
-                if (strequal(fname,".com") ||
-                    strequal(fname,".dll") ||
-                    strequal(fname,".exe") ||
-                    strequal(fname,".sym")) {
-                        return True;
-                }
-        }
-        return False;
-}
-
 /****************************************************************************
  Check if we can open a file with a share mode.
@@ -1221 +1204 @@
         return dup_file_fsp(req, fsp, access_mask, share_access,
                             create_options, fsp_to_dup_into);
-}
-
-/****************************************************************************
- Open a file with a share mode - old openX method - map into NTCreate.
-****************************************************************************/
-
-bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname,
-                                 int deny_mode, int open_func,
-                                 uint32 *paccess_mask,
-                                 uint32 *pshare_mode,
-                                 uint32 *pcreate_disposition,
-                                 uint32 *pcreate_options)
-{
-        uint32 access_mask;
-        uint32 share_mode;
-        uint32 create_disposition;
-        uint32 create_options = FILE_NON_DIRECTORY_FILE;
-
-        DEBUG(10,("map_open_params_to_ntcreate: fname = %s, deny_mode = 0x%x, "
-                  "open_func = 0x%x\n",
-                  smb_fname_str_dbg(smb_fname), (unsigned int)deny_mode,
-                  (unsigned int)open_func ));
-
-        /* Create the NT compatible access_mask. */
-        switch (GET_OPENX_MODE(deny_mode)) {
-                case DOS_OPEN_EXEC: /* Implies read-only - used to be FILE_READ_DATA */
-                case DOS_OPEN_RDONLY:
-                        access_mask = FILE_GENERIC_READ;
-                        break;
-                case DOS_OPEN_WRONLY:
-                        access_mask = FILE_GENERIC_WRITE;
-                        break;
-                case DOS_OPEN_RDWR:
-                case DOS_OPEN_FCB:
-                        access_mask = FILE_GENERIC_READ|FILE_GENERIC_WRITE;
-                        break;
-                default:
-                        DEBUG(10,("map_open_params_to_ntcreate: bad open mode = 0x%x\n",
-                                  (unsigned int)GET_OPENX_MODE(deny_mode)));
-                        return False;
-        }
-
-        /* Create the NT compatible create_disposition. */
-        switch (open_func) {
-                case OPENX_FILE_EXISTS_FAIL|OPENX_FILE_CREATE_IF_NOT_EXIST:
-                        create_disposition = FILE_CREATE;
-                        break;
-
-                case OPENX_FILE_EXISTS_OPEN:
-                        create_disposition = FILE_OPEN;
-                        break;
-
-                case OPENX_FILE_EXISTS_OPEN|OPENX_FILE_CREATE_IF_NOT_EXIST:
-                        create_disposition = FILE_OPEN_IF;
-                        break;
-       
-                case OPENX_FILE_EXISTS_TRUNCATE:
-                        create_disposition = FILE_OVERWRITE;
-                        break;
-
-                case OPENX_FILE_EXISTS_TRUNCATE|OPENX_FILE_CREATE_IF_NOT_EXIST:
-                        create_disposition = FILE_OVERWRITE_IF;
-                        break;
-
-                default:
-                        /* From samba4 - to be confirmed. */
-                        if (GET_OPENX_MODE(deny_mode) == DOS_OPEN_EXEC) {
-                                create_disposition = FILE_CREATE;
-                                break;
-                        }
-                        DEBUG(10,("map_open_params_to_ntcreate: bad "
-                                  "open_func 0x%x\n", (unsigned int)open_func));
-                        return False;
-        }
- 
-        /* Create the NT compatible share modes. */
-        switch (GET_DENY_MODE(deny_mode)) {
-                case DENY_ALL:
-                        share_mode = FILE_SHARE_NONE;
-                        break;
-
-                case DENY_WRITE:
-                        share_mode = FILE_SHARE_READ;
-                        break;
-
-                case DENY_READ:
-                        share_mode = FILE_SHARE_WRITE;
-                        break;
-
-                case DENY_NONE:
-                        share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE;
-                        break;
-
-                case DENY_DOS:
-                        create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_DOS;
-                        if (is_executable(smb_fname->base_name)) {
-                                share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE;
-                        } else {
-                                if (GET_OPENX_MODE(deny_mode) == DOS_OPEN_RDONLY) {
-                                        share_mode = FILE_SHARE_READ;
-                                } else {
-                                        share_mode = FILE_SHARE_NONE;
-                                }
-                        }
-                        break;
-
-                case DENY_FCB:
-                        create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_FCB;
-                        share_mode = FILE_SHARE_NONE;
-                        break;
-
-                default:
-                        DEBUG(10,("map_open_params_to_ntcreate: bad deny_mode 0x%x\n",
-                                (unsigned int)GET_DENY_MODE(deny_mode) ));
-                        return False;
-        }
-
-        DEBUG(10,("map_open_params_to_ntcreate: file %s, access_mask = 0x%x, "
-                  "share_mode = 0x%x, create_disposition = 0x%x, "
-                  "create_options = 0x%x\n",
-                  smb_fname_str_dbg(smb_fname),
-                  (unsigned int)access_mask,
-                  (unsigned int)share_mode,
-                  (unsigned int)create_disposition,
-                  (unsigned int)create_options ));
-
-        if (paccess_mask) {
-                *paccess_mask = access_mask;
-        }
-        if (pshare_mode) {
-                *pshare_mode = share_mode;
-        }
-        if (pcreate_disposition) {
-                *pcreate_disposition = create_disposition;
-        }
-        if (pcreate_options) {
-                *pcreate_options = create_options;
-        }
-
-        return True;
-
 }
 
@@ -1503 +1345 @@
         ZERO_STRUCT(id);
 
-        /* Windows allows a new file to be created and
-           silently removes a FILE_ATTRIBUTE_DIRECTORY
-           sent by the client. Do the same. */
-
-        new_dos_attributes &= ~FILE_ATTRIBUTE_DIRECTORY;
-
         if (conn->printer) {
                 /*
@@ -1542 +1378 @@
                 new_dos_attributes = 0;
         } else {
+                /* Windows allows a new file to be created and
+                   silently removes a FILE_ATTRIBUTE_DIRECTORY
+                   sent by the client. Do the same. */
+
+                new_dos_attributes &= ~FILE_ATTRIBUTE_DIRECTORY;
+
                 /* We add aARCH to this as this mode is only used if the file is
                  * created new. */

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

@@ -1398 +1398 @@
                 pace->trustee = *pfile_owner_sid;
                 pace->attr = ALLOW_ACE;
+                /* Start with existing permissions, principle of least
+                   surprises for the user. */
+                pace->perms = pst->st_ex_mode;
 
                 if (setting_acl) {
                         /* See if the owning user is in any of the other groups in
-                           the ACE. If so, OR in the permissions from that group. */
-
-                        bool group_matched = False;
+                           the ACE, or if there's a matching user entry.
+                           If so, OR in the permissions from that entry. */
+
                         canon_ace *pace_iter;
 
                         for (pace_iter = *pp_ace; pace_iter; pace_iter = pace_iter->next) {
-                                if (pace_iter->type == SMB_ACL_GROUP_OBJ || pace_iter->type == SMB_ACL_GROUP) {
+                                if (pace_iter->type == SMB_ACL_USER &&
+                                                pace_iter->unix_ug.uid == pace->unix_ug.uid) {
+                                        pace->perms |= pace_iter->perms;
+                                } else if (pace_iter->type == SMB_ACL_GROUP_OBJ || pace_iter->type == SMB_ACL_GROUP) {
                                         if (uid_entry_in_group(pace, pace_iter)) {
                                                 pace->perms |= pace_iter->perms;
-                                                group_matched = True;
                                         }
                                 }
                         }
 
-                        /* If we only got an "everyone" perm, just use that. */
-                        if (!group_matched) {
+                        if (pace->perms == 0) {
+                                /* If we only got an "everyone" perm, just use that. */
                                 if (got_other)
                                         pace->perms = pace_other->perms;
-                                else
-                                        pace->perms = 0;
                         }
 
@@ -1485 +1488 @@
  If it does not have them, check if there are any entries where the trustee is the
  file owner or the owning group, and map these to SMB_ACL_USER_OBJ and SMB_ACL_GROUP_OBJ.
+ Note we must not do this to default directory ACLs.
 ****************************************************************************/
 
@@ -1524 +1528 @@
         if (!got_group_obj)
                 DEBUG(10,("check_owning_objs: ACL is missing an owning group entry.\n"));
-}
-
-/****************************************************************************
- If an ACE entry is SMB_ACL_USER_OBJ and not CREATOR_OWNER, map to SMB_ACL_USER.
- If an ACE entry is SMB_ACL_GROUP_OBJ and not CREATOR_GROUP, map to SMB_ACL_GROUP
-****************************************************************************/
-
-static bool dup_owning_ace(canon_ace *dir_ace, canon_ace *ace)
-{
-        /* dir ace must be followings.
-           SMB_ACL_USER_OBJ : trustee(CREATOR_OWNER) -> Posix ACL d:u::perm
-           SMB_ACL_USER     : not trustee    -> Posix ACL u:user:perm
-           SMB_ACL_USER_OBJ : trustee -> convert to SMB_ACL_USER : trustee
-           Posix ACL u:trustee:perm
-
-           SMB_ACL_GROUP_OBJ: trustee(CREATOR_GROUP) -> Posix ACL d:g::perm
-           SMB_ACL_GROUP    : not trustee   -> Posix ACL g:group:perm
-           SMB_ACL_GROUP_OBJ: trustee -> convert to SMB_ACL_GROUP : trustee
-           Posix ACL g:trustee:perm
-        */
-
-        if (ace->type == SMB_ACL_USER_OBJ &&
-                        !(sid_equal(&ace->trustee, &global_sid_Creator_Owner))) {
-                canon_ace *dup_ace = dup_canon_ace(ace);
-
-                if (dup_ace == NULL) {
-                        return false;
-                }
-                dup_ace->type = SMB_ACL_USER;
-                DLIST_ADD_END(dir_ace, dup_ace, canon_ace *);
-        }
-
-        if (ace->type == SMB_ACL_GROUP_OBJ &&
-                        !(sid_equal(&ace->trustee, &global_sid_Creator_Group))) {
-                canon_ace *dup_ace = dup_canon_ace(ace);
-
-                if (dup_ace == NULL) {
-                        return false;
-                }
-                dup_ace->type = SMB_ACL_GROUP;
-                DLIST_ADD_END(dir_ace, dup_ace, canon_ace *);
-        }
-
-        return true;
 }
 
@@ -1793 +1753 @@
                                 (SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT)) {
 
+                                canon_ace *current_dir_ace = current_ace;
                                 DLIST_ADD_END(dir_ace, current_ace, canon_ace *);
 
@@ -1818 +1779 @@
                                         dbgtext("create_canon_ace_lists: adding dir ACL:\n");
                                         print_canon_ace( current_ace, 0);
-                                }
-
-                                /*
-                                 * We have a lossy mapping: directory ACE entries
-                                 * CREATOR_OWNER ------\
-                                 *     (map to)         +---> SMB_ACL_USER_OBJ
-                                 * owning sid    ------/
-                                 *
-                                 * CREATOR_GROUP ------\
-                                 *     (map to)         +---> SMB_ACL_GROUP_OBJ
-                                 * primary group sid --/
-                                 *
-                                 * on set. And on read of a directory ACL
-                                 *
-                                 * SMB_ACL_USER_OBJ ----> CREATOR_OWNER
-                                 * SMB_ACL_GROUP_OBJ ---> CREATOR_GROUP.
-                                 *
-                                 * Deal with this on set by duplicating
-                                 * owning sid and primary group sid ACE
-                                 * entries into the directory ACL.
-                                 * Fix from Tsukasa Hamano <hamano@osstech.co.jp>.
-                                 */
-
-                                if (!dup_owning_ace(dir_ace, current_ace)) {
-                                        DEBUG(0,("create_canon_ace_lists: malloc fail !\n"));
-                                        free_canon_ace_list(file_ace);
-                                        free_canon_ace_list(dir_ace);
-                                        return false;
                                 }
 
@@ -1882 +1815 @@
                                         current_ace = NULL;
                                 }
+
+                                /*
+                                 * current_ace is now either owned by file_ace
+                                 * or is NULL. We can safely operate on current_dir_ace
+                                 * to treat mapping for default acl entries differently
+                                 * than access acl entries.
+                                 */
+
+                                if (current_dir_ace->owner_type == UID_ACE) {
+                                        /*
+                                         * We already decided above this is a uid,
+                                         * for default acls ace's only CREATOR_OWNER
+                                         * maps to ACL_USER_OBJ. All other uid
+                                         * ace's are ACL_USER.
+                                         */
+                                        if (sid_equal(&current_dir_ace->trustee,
+                                                        &global_sid_Creator_Owner)) {
+                                                current_dir_ace->type = SMB_ACL_USER_OBJ;
+                                        } else {
+                                                current_dir_ace->type = SMB_ACL_USER;
+                                        }
+                                }
+
+                                if (current_dir_ace->owner_type == GID_ACE) {
+                                        /*
+                                         * We already decided above this is a gid,
+                                         * for default acls ace's only CREATOR_GROUP
+                                         * maps to ACL_GROUP_OBJ. All other uid
+                                         * ace's are ACL_GROUP.
+                                         */
+                                        if (sid_equal(&current_dir_ace->trustee,
+                                                        &global_sid_Creator_Group)) {
+                                                current_dir_ace->type = SMB_ACL_GROUP_OBJ;
+                                        } else {
+                                                current_dir_ace->type = SMB_ACL_GROUP;
+                                        }
+                                }
                         }
                 }
@@ -1943 +1913 @@
         } else {
                 /*
-                 * Check if we have SMB_ACL_USER_OBJ and SMB_ACL_GROUP_OBJ entries in each
-                 * ACL. If we don't have them, check if any SMB_ACL_USER/SMB_ACL_GROUP
-                 * entries can be converted to *_OBJ. Usually we will already have these
-                 * entries in the Default ACL, and the Access ACL will not have them.
+                 * Check if we have SMB_ACL_USER_OBJ and SMB_ACL_GROUP_OBJ entries in
+                 * the file ACL. If we don't have them, check if any SMB_ACL_USER/SMB_ACL_GROUP
+                 * entries can be converted to *_OBJ. Don't do this for the default
+                 * ACL, we will create them separately for this if needed inside
+                 * ensure_canon_entry_valid().
                  */
                 if (file_ace) {
                         check_owning_objs(file_ace, pfile_owner_sid, pfile_grp_sid);
-                }
-                if (dir_ace) {
-                        check_owning_objs(dir_ace, pfile_owner_sid, pfile_grp_sid);
                 }
         }
@@ -2275 +2243 @@
 
 /****************************************************************************
- Create a default mode that will be used if a security descriptor entry has
- no user/group/world entries.
-****************************************************************************/
-
-static mode_t create_default_mode(files_struct *fsp, bool interitable_mode)
-{
-        int snum = SNUM(fsp->conn);
-        mode_t and_bits = (mode_t)0;
-        mode_t or_bits = (mode_t)0;
-        mode_t mode;
-
-        if (interitable_mode) {
-                mode = unix_mode(fsp->conn, FILE_ATTRIBUTE_ARCHIVE,
-                                 fsp->fsp_name, NULL);
-        } else {
-                mode = S_IRUSR;
-        }
-
-        if (fsp->is_directory)
-                mode |= (S_IWUSR|S_IXUSR);
-
-        /*
-         * Now AND with the create mode/directory mode bits then OR with the
-         * force create mode/force directory mode bits.
-         */
-
-        if (fsp->is_directory) {
-                and_bits = lp_dir_security_mask(snum);
-                or_bits = lp_force_dir_security_mode(snum);
-        } else {
-                and_bits = lp_security_mask(snum);
-                or_bits = lp_force_security_mode(snum);
-        }
-
-        return ((mode & and_bits)|or_bits);
-}
-
-/****************************************************************************
  Unpack a SEC_DESC into two canonical ace lists. We don't depend on this
  succeeding.
@@ -2326 +2256 @@
                                 const SEC_DESC *psd)
 {
-        SMB_STRUCT_STAT st;
         canon_ace *file_ace = NULL;
         canon_ace *dir_ace = NULL;
@@ -2390 +2319 @@
         print_canon_ace_list( "file ace - before valid", file_ace);
 
-        st = *pst;
-
-        /*
-         * A default 3 element mode entry for a file should be r-- --- ---.
-         * A default 3 element mode entry for a directory should be rwx --- ---.
-         */
-
-        st.st_ex_mode = create_default_mode(fsp, False);
-
         if (!ensure_canon_entry_valid(&file_ace, fsp->conn->params,
-                        fsp->is_directory, pfile_owner_sid, pfile_grp_sid, &st, True)) {
+                        fsp->is_directory, pfile_owner_sid, pfile_grp_sid, pst, True)) {
                 free_canon_ace_list(file_ace);
                 free_canon_ace_list(dir_ace);
@@ -2408 +2328 @@
         print_canon_ace_list( "dir ace - before valid", dir_ace);
 
-        /*
-         * A default inheritable 3 element mode entry for a directory should be the
-         * mode Samba will use to create a file within. Ensure user rwx bits are set if
-         * it's a directory.
-         */
-
-        st.st_ex_mode = create_default_mode(fsp, True);
-
         if (dir_ace && !ensure_canon_entry_valid(&dir_ace, fsp->conn->params,
-                        fsp->is_directory, pfile_owner_sid, pfile_grp_sid, &st, True)) {
+                        fsp->is_directory, pfile_owner_sid, pfile_grp_sid, pst, True)) {
                 free_canon_ace_list(file_ace);
                 free_canon_ace_list(dir_ace);

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

@@ -1910 +1910 @@
 
         /*
-         * Check if the client tries to fool us. The request so far uses the
-         * space to the end of the byte buffer in the request just
-         * processed. The chain_offset can't point into that area. If that was
-         * the case, we could end up with an endless processing of the chain,
-         * we would always handle the same request.
-         */
-
-        already_used = PTR_DIFF(req->buf+req->buflen, smb_base(req->inbuf));
-        if (chain_offset < already_used) {
+         * Check if the client tries to fool us. The chain offset
+         * needs to point beyond the current request in the chain, it
+         * needs to strictly grow. Otherwise we might be tricked into
+         * an endless loop always processing the same request over and
+         * over again. We used to assume that vwv and the byte buffer
+         * array in a chain are always attached, but OS/2 the
+         * Write&X/Read&X chain puts the Read&X vwv array right behind
+         * the Write&X vwv chain. The Write&X bcc array is put behind
+         * the Read&X vwv array. So now we check whether the chain
+         * offset points strictly behind the previous vwv
+         * array. req->buf points right after the vwv array of the
+         * previous request. See
+         * https://bugzilla.samba.org/show_bug.cgi?id=8360 for more
+         * information.
+         */
+
+        already_used = PTR_DIFF(req->buf, smb_base(req->inbuf));
+        if (chain_offset <= already_used) {
                 goto error;
         }

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

@@ -1754 +1754 @@
         }
 
-        if (!map_open_params_to_ntcreate(smb_fname, deny_mode,
+        if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
                                          OPENX_FILE_EXISTS_OPEN, &access_mask,
                                          &share_mode, &create_disposition,
@@ -1927 +1927 @@
         }
 
-        if (!map_open_params_to_ntcreate(smb_fname, deny_mode, smb_ofun,
+        if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
+                                         smb_ofun,
                                          &access_mask, &share_mode,
                                          &create_disposition,
@@ -6436 +6437 @@
                 new_create_disposition = FILE_OPEN;
         } else {
-                if (!map_open_params_to_ntcreate(smb_fname_dst_tmp, 0, ofun,
+                if (!map_open_params_to_ntcreate(smb_fname_dst_tmp->base_name,
+                                                 0, ofun,
                                                  NULL, NULL,
                                                  &new_create_disposition,

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

@@ -146 +146 @@
  *
  * @param conn    A connection struct to do the stat() with.
+ * @param posix_paths Whether to lookup using stat() or lstat()
  * @param name    The path we are attempting to cache, modified by this routine
  *                to be correct as far as the cache can tell us. We assume that
@@ -162 +163 @@
 
 bool stat_cache_lookup(connection_struct *conn,
+                        bool posix_paths,
                         char **pp_name,
                         char **pp_dirpath,
@@ -177 +179 @@
         TALLOC_CTX *ctx = talloc_tos();
         struct smb_filename smb_fname;
+        int ret;
 
         *pp_dirpath = NULL;
@@ -279 +282 @@
         smb_fname.base_name = translated_path;
 
-        if (SMB_VFS_STAT(conn, &smb_fname) != 0) {
+        if (posix_paths) {
+                ret = SMB_VFS_LSTAT(conn, &smb_fname);
+        } else {
+                ret = SMB_VFS_STAT(conn, &smb_fname);
+        }
+
+        if (ret != 0) {
                 /* Discard this entry - it doesn't exist in the filesystem. */
                 memcache_delete(smbd_memcache(), STAT_CACHE,

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

@@ -1082 +1082 @@
         }
 
-        if (!map_open_params_to_ntcreate(smb_fname, deny_mode, open_ofun,
+        if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
+                                         open_ofun,
                                          &access_mask, &share_mode,
                                          &create_disposition,
@@ -2246 +2247 @@
         struct dptr_struct *dirptr = NULL;
         struct smbd_server_connection *sconn = smbd_server_conn;
+        uint32_t ucf_flags = (UCF_SAVE_LCOMP | UCF_ALWAYS_ALLOW_WCARD_LCOMP);
 
         if (total_params < 13) {
@@ -2289 +2291 @@
                                 goto out;
                         }
+                        ucf_flags |= UCF_UNIX_NAME_LOOKUP;
                         break;
                 default:
@@ -2306 +2309 @@
                                     req->flags2 & FLAGS2_DFS_PATHNAMES,
                                     directory,
-                                    (UCF_SAVE_LCOMP |
-                                        UCF_ALWAYS_ALLOW_WCARD_LCOMP),
+                                    ucf_flags,
                                     &mask_contains_wcard,
                                     &smb_dname);
@@ -5102 +5104 @@
         } else {
                 char *fname = NULL;
+                uint32_t ucf_flags = 0;
 
                 /* qpathinfo */
@@ -5113 +5116 @@
                 DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
 
-                if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
-                        reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-                        return;
+                if (INFO_LEVEL_IS_UNIX(info_level)) {
+                        if (!lp_unix_extensions()) {
+                                reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+                                return;
+                        }
+                        if (info_level == SMB_QUERY_FILE_UNIX_BASIC ||
+                                        info_level == SMB_QUERY_FILE_UNIX_INFO2 ||
+                                        info_level == SMB_QUERY_FILE_UNIX_LINK) {
+                                ucf_flags |= UCF_UNIX_NAME_LOOKUP;
+                        }
                 }
 
@@ -5130 +5140 @@
                                         req->flags2 & FLAGS2_DFS_PATHNAMES,
                                         fname,
-                                        0,
+                                        ucf_flags,
                                         NULL,
                                         &smb_fname);

branches/samba-3.5.x/source3/web/swat.c

@@ -169 +169 @@
 
                 snprintf(tmp, sizeof(tmp), "%02x", token[i]);
-                strncat(token_str, tmp, sizeof(tmp));
+                strlcat(token_str, tmp, sizeof(tmp));
         }
 }
@@ -193 +193 @@
         const char *token = cgi_variable_nonull(XSRF_TOKEN);
         const char *time_str = cgi_variable_nonull(XSRF_TIME);
+        char *p = NULL;
+        long long xsrf_time_ll = 0;
         time_t xsrf_time = 0;
         time_t now = time(NULL);
 
-        if (sizeof(time_t) == sizeof(int)) {
-                xsrf_time = atoi(time_str);
-        } else if (sizeof(time_t) == sizeof(long)) {
-                xsrf_time = atol(time_str);
-        } else if (sizeof(time_t) == sizeof(long long)) {
-                xsrf_time = atoll(time_str);
-        }
+        errno = 0;
+        xsrf_time_ll = strtoll(time_str, &p, 10);
+        if (errno != 0) {
+                return false;
+        }
+        if (p == NULL) {
+                return false;
+        }
+        if (PTR_DIFF(p, time_str) > strlen(time_str)) {
+                return false;
+        }
+        if (xsrf_time_ll > _TYPE_MAXIMUM(time_t)) {
+                return false;
+        }
+        if (xsrf_time_ll < _TYPE_MINIMUM(time_t)) {
+                return false;
+        }
+        xsrf_time = xsrf_time_ll;
 
         if (abs(now - xsrf_time) > XSRF_TIMEOUT) {

branches/samba-3.5.x/source3/winbindd/wb_group_members.c

@@ -214 +214 @@
 
         if (!NT_STATUS_IS_OK(status)) {
-                tevent_req_nterror(req, status);
-                return;
+                if (!NT_STATUS_EQUAL(
+                            status, NT_STATUS_TRUSTED_DOMAIN_FAILURE)) {
+                        tevent_req_nterror(req, status);
+                        return;
+                }
+                num_members = 0;
         }
 

branches/samba-3.5.x/source3/winbindd/winbindd.c

@@ -904 +904 @@
                                           struct winbindd_listen_state);
 
-        while (winbindd_num_clients() >
-               WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) {
+        while (winbindd_num_clients() > lp_winbind_max_clients() - 1) {
                 DEBUG(5,("winbindd: Exceeding %d client "
                          "connections, removing idle "
-                         "connection.\n",
-                         WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
+                         "connection.\n", lp_winbind_max_clients()));
                 if (!remove_idle_client()) {
                         DEBUG(0,("winbindd: Exceeding %d "
                                  "client connections, no idle "
                                  "connection found\n",
-                                 WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
+                                 lp_winbind_max_clients()));
                         break;
                 }

branches/samba-3.5.x/source3/winbindd/winbindd_dual.c

@@ -135 +135 @@
         struct tevent_req *subreq;
 
-        if ((state->child->pid == 0) && (!fork_domain_child(state->child))) {
+        if ((state->child->sock == -1) && (!fork_domain_child(state->child))) {
                 tevent_req_error(req, errno);
                 return;
@@ -165 +165 @@
         TALLOC_FREE(subreq);
         if (ret == -1) {
+                /*
+                 * The basic parent/child communication broke, close
+                 * our socket
+                 */
+                close(state->child->sock);
+                state->child->sock = -1;
                 tevent_req_error(req, err);
                 return;
@@ -503 +509 @@
         }
 
+        child->sock = -1;
         child->domain = domain;
         child->table = table;
@@ -531 +538 @@
 
         DLIST_REMOVE(children, child);
-
-        close(child->sock);
-        child->sock = -1;
         child->pid = 0;
 }

branches/samba-3.5.x/source3/winbindd/winbindd_pam.c

@@ -1383 +1383 @@
                                   &my_info3);
 
-                if ((NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR)
-                    && contact_domain->can_do_samlogon_ex) {
-                        DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
-                                  "retrying with NetSamLogon\n"));
-                        contact_domain->can_do_samlogon_ex = false;
+                if (NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR) {
+
                         /*
                          * It's likely that the server also does not support
@@ -1393 +1390 @@
                          */
                         domain->can_do_validation6 = false;
-                        retry = true;
-                        continue;
+
+                        if (contact_domain->can_do_samlogon_ex) {
+                                DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
+                                          "retrying with NetSamLogon\n"));
+                                contact_domain->can_do_samlogon_ex = false;
+                                retry = true;
+                                continue;
+                        }
+
+                        /* Got DCERPC_FAULT_OP_RNG_ERROR for SamLogon
+                         * (no Ex). This happens against old Samba
+                         * DCs. Drop the connection.
+                         */
+                        invalidate_cm_connection(&contact_domain->conn);
+                        result = NT_STATUS_LOGON_FAILURE;
+                        break;
                 }
 
@@ -1997 +2008 @@
                                   &info3);
 
-                if ((NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR)
-                    && contact_domain->can_do_samlogon_ex) {
-                        DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
-                                  "retrying with NetSamLogon\n"));
-                        contact_domain->can_do_samlogon_ex = false;
+                if (NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR) {
+
                         /*
                          * It's likely that the server also does not support
@@ -2007 +2015 @@
                          */
                         domain->can_do_validation6 = false;
-                        retry = true;
-                        continue;
+
+                        if (contact_domain->can_do_samlogon_ex) {
+                                DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
+                                          "retrying with NetSamLogon\n"));
+                                contact_domain->can_do_samlogon_ex = false;
+                                retry = true;
+                                continue;
+                        }
+
+                        /* Got DCERPC_FAULT_OP_RNG_ERROR for SamLogon
+                         * (no Ex). This happens against old Samba
+                         * DCs. Drop the connection.
+                         */
+                        invalidate_cm_connection(&contact_domain->conn);
+                        result = NT_STATUS_LOGON_FAILURE;
+                        break;
                 }