X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2Fsmbd%2Fservice.c;h=8039d16586eb164f576f4c4def3a919aac6feff1;hb=bd269443e311d96ef495a9db47d1b95eb83bb8f4;hp=0124b2b047cbdabf72bd816b5ad8acd5315ad1e6;hpb=d57e67f9eb5a6a05f0e173d48e86dd1fe050635e;p=samba.git

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 0124b2b047c..8039d16586e 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -56,7 +56,12 @@ bool set_conn_connectpath(connection_struct *conn, const char *connectpath)
 	const char *s = connectpath;
         bool start_of_name_component = true;
 
-	destname = SMB_STRDUP(connectpath);
+	if (connectpath == NULL || connectpath[0] == '\0') {
+		return false;
+	}
+
+	/* Allocate for strlen + '\0' + possible leading '/' */
+	destname = SMB_MALLOC(strlen(connectpath) + 2);
 	if (!destname) {
 		return false;
 	}
@@ -182,8 +187,8 @@ bool set_current_service(connection_struct *conn, uint16 flags, bool do_chdir)
 	if (do_chdir &&
 	    vfs_ChDir(conn,conn->connectpath) != 0 &&
 	    vfs_ChDir(conn,conn->origpath) != 0) {
-		DEBUG(0,("chdir (%s) failed\n",
-			 conn->connectpath));
+                DEBUG(((errno!=EACCES)?0:3),("chdir (%s) failed, reason: %s\n",
+                         conn->connectpath, strerror(errno)));
 		return(False);
 	}
 
@@ -259,7 +264,7 @@ int add_home_service(const char *service, const char *username, const char *home
 {
 	int iHomeService;
 
-	if (!service || !homedir)
+	if (!service || !homedir || homedir[0] == '\0')
 		return -1;
 
 	if ((iHomeService = lp_servicenumber(HOMES_NAME)) < 0) {
@@ -673,7 +678,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 		DEBUG(1, ("create_connection_server_info failed: %s\n",
 			  nt_errstr(status)));
 		*pstatus = status;
-		conn_free(sconn, conn);
+		conn_free(conn);
 		return NULL;
 	}
 
@@ -692,7 +697,6 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 	conn->printer = (strncmp(dev,"LPT",3) == 0);
 	conn->ipc = ( (strncmp(dev,"IPC",3) == 0) ||
 		      ( lp_enable_asu_support() && strequal(dev,"ADMIN$")) );
-	conn->dirptr = NULL;
 
 	/* Case options for the share. */
 	if (lp_casesensitive(snum) == Auto) {
@@ -712,7 +716,6 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 	conn->hide_list = NULL;
 	conn->veto_oplock_list = NULL;
 	conn->aio_write_behind_list = NULL;
-	string_set(&conn->dirpath,"");
 
 	conn->read_only = lp_readonly(SNUM(conn));
 	conn->admin_user = False;
@@ -730,7 +733,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 		fuser = talloc_string_sub(conn, lp_force_user(snum), "%S",
 					  lp_servicename(snum));
 		if (fuser == NULL) {
-			conn_free(sconn, conn);
+			conn_free(conn);
 			*pstatus = NT_STATUS_NO_MEMORY;
 			return NULL;
 		}
@@ -739,7 +742,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 			conn, fuser, conn->server_info->guest,
 			&forced_serverinfo);
 		if (!NT_STATUS_IS_OK(status)) {
-			conn_free(sconn, conn);
+			conn_free(conn);
 			*pstatus = status;
 			return NULL;
 		}
@@ -764,7 +767,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 			&conn->server_info->utok.gid);
 
 		if (!NT_STATUS_IS_OK(status)) {
-			conn_free(sconn, conn);
+			conn_free(conn);
 			*pstatus = status;
 			return NULL;
 		}
@@ -790,14 +793,14 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 					pdb_get_domain(conn->server_info->sam_account),
 					lp_pathname(snum));
 		if (!s) {
-			conn_free(sconn, conn);
+			conn_free(conn);
 			*pstatus = NT_STATUS_NO_MEMORY;
 			return NULL;
 		}
 
 		if (!set_conn_connectpath(conn,s)) {
 			TALLOC_FREE(s);
-			conn_free(sconn, conn);
+			conn_free(conn);
 			*pstatus = NT_STATUS_NO_MEMORY;
 			return NULL;
 		}
@@ -829,7 +832,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 					 "denied due to security "
 					 "descriptor.\n",
 					  lp_servicename(snum)));
-				conn_free(sconn, conn);
+				conn_free(conn);
 				*pstatus = NT_STATUS_ACCESS_DENIED;
 				return NULL;
 			} else {
@@ -842,7 +845,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 	if (!smbd_vfs_init(conn)) {
 		DEBUG(0, ("vfs_init failed for service %s\n",
 			  lp_servicename(snum)));
-		conn_free(sconn, conn);
+		conn_free(conn);
 		*pstatus = NT_STATUS_BAD_NETWORK_NAME;
 		return NULL;
 	}
@@ -860,7 +863,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 			"for service %s, path %s\n",
 				lp_servicename(snum),
 				conn->connectpath));
-			conn_free(sconn, conn);
+			conn_free(conn);
 			*pstatus = NT_STATUS_BAD_NETWORK_NAME;
 			return NULL;
 		}
@@ -884,7 +887,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 
 		DEBUG(1, ("Max connections (%d) exceeded for %s\n",
 			  lp_max_connections(snum), lp_servicename(snum)));
-		conn_free(sconn, conn);
+		conn_free(conn);
 		*pstatus = NT_STATUS_INSUFFICIENT_RESOURCES;
 		return NULL;
 	}  
@@ -894,7 +897,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 	 */
 	if (!claim_connection(conn, lp_servicename(snum), 0)) {
 		DEBUG(1, ("Could not store connections entry\n"));
-		conn_free(sconn, conn);
+		conn_free(conn);
 		*pstatus = NT_STATUS_INTERNAL_DB_ERROR;
 		return NULL;
 	}  
@@ -918,7 +921,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 			DEBUG(1,("root preexec gave %d - failing "
 				 "connection\n", ret));
 			yield_connection(conn, lp_servicename(snum));
-			conn_free(sconn, conn);
+			conn_free(conn);
 			*pstatus = NT_STATUS_ACCESS_DENIED;
 			return NULL;
 		}
@@ -929,7 +932,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 		/* No point continuing if they fail the basic checks */
 		DEBUG(0,("Can't become connected user!\n"));
 		yield_connection(conn, lp_servicename(snum));
-		conn_free(sconn, conn);
+		conn_free(conn);
 		*pstatus = NT_STATUS_LOGON_FAILURE;
 		return NULL;
 	}
@@ -1036,12 +1039,20 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 	}
 #endif
 
+	if (lp_unix_extensions() && lp_widelinks(snum)) {
+		DEBUG(0,("Share '%s' has wide links and unix extensions enabled. "
+			"These parameters are incompatible. "
+			"Disabling wide links for this share.\n",
+			lp_servicename(snum) ));
+		lp_do_parameter(snum, "wide links", "False");
+	}
+
 	/* Figure out the characteristics of the underlying filesystem. This
 	 * assumes that all the filesystem mounted withing a share path have
 	 * the same characteristics, which is likely but not guaranteed.
 	 */
 
-	conn->fs_capabilities = SMB_VFS_FS_CAPABILITIES(conn);
+	conn->fs_capabilities = SMB_VFS_FS_CAPABILITIES(conn, &conn->ts_res);
 
 	/*
 	 * Print out the 'connected as' stuff here as we need
@@ -1072,7 +1083,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
 		SMB_VFS_DISCONNECT(conn);
 	}
 	yield_connection(conn, lp_servicename(snum));
-	conn_free(sconn, conn);
+	conn_free(conn);
 	return NULL;
 }
 
@@ -1191,7 +1202,7 @@ connection_struct *make_connection(struct smbd_server_connection *sconn,
 			return NULL;
 		}
 
-		DEBUG(0,("%s (%s) couldn't find service %s\n",
+		DEBUG(3,("%s (%s) couldn't find service %s\n",
 			get_remote_machine_name(),
 			client_addr(get_client_fd(),addr,sizeof(addr)),
 			service));
@@ -1219,8 +1230,7 @@ connection_struct *make_connection(struct smbd_server_connection *sconn,
  Close a cnum.
 ****************************************************************************/
 
-void close_cnum(struct smbd_server_connection *sconn,
-		connection_struct *conn, uint16 vuid)
+void close_cnum(connection_struct *conn, uint16 vuid)
 {
 	file_close_conn(conn);
 
@@ -1274,5 +1284,5 @@ void close_cnum(struct smbd_server_connection *sconn,
 		TALLOC_FREE(cmd);
 	}
 
-	conn_free(sconn, conn);
+	conn_free(conn);
 }