[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1050-ge9467ff

[Volker Lendecke]

The branch, master has been updated
       via  e9467ff26ed429dbb2d4249da5bedf545664253b (commit)
       via  5a5af073bbc4a1bcb78cded8b45c646feeeb5d0d (commit)
       via  3305780e5d5d10a35e116f43efe47b8a94a9d3fd (commit)
       via  25627234451735154d7c8a12ed920397d0371b1c (commit)
      from  c207fe42a796cf33f1901caeb2c4c1e493b94471 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e9467ff26ed429dbb2d4249da5bedf545664253b
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Feb 12 16:21:45 2009 +0100

    Fix a typo

commit 5a5af073bbc4a1bcb78cded8b45c646feeeb5d0d
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Feb 14 13:43:09 2009 +0100

    Do not close an fd we know is -1

commit 3305780e5d5d10a35e116f43efe47b8a94a9d3fd
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Feb 19 23:26:06 2009 +0100

    Move some bytes from the data to the text segment

commit 25627234451735154d7c8a12ed920397d0371b1c
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Feb 21 12:49:01 2009 +0100

    Fix an uninitialized variable

-----------------------------------------------------------------------

Summary of changes:
 source3/libsmb/libsmb_path.c   |    6 +++---
 source3/param/loadparm.c       |    2 +-
 source3/passdb/pdb_interface.c |    2 +-
 source3/smbd/server.c          |    1 -
 4 files changed, 5 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/libsmb_path.c b/source3/libsmb/libsmb_path.c
index 3ea0344..6a59a12 100644
--- a/source3/libsmb/libsmb_path.c
+++ b/source3/libsmb/libsmb_path.c
@@ -216,7 +216,7 @@ smbc_urlencode(char *dest,
  * are supported.
  */
 
-static const char *smbc_prefix = "smb:";
+#define SMBC_PREFIX "smb:"
 
 int
 SMBC_parse_path(TALLOC_CTX *ctx,
@@ -263,8 +263,8 @@ SMBC_parse_path(TALLOC_CTX *ctx,
 	s = talloc_strdup(ctx, fname);
         
 	/* see if it has the right prefix */
-	len = strlen(smbc_prefix);
-	if (strncmp(s,smbc_prefix,len) || (s[len] != '/' && s[len] != 0)) {
+	len = strlen(SMBC_PREFIX);
+	if (strncmp(s,SMBC_PREFIX,len) || (s[len] != '/' && s[len] != 0)) {
                 return -1; /* What about no smb: ? */
         }
         
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index cb56825..3d29f3a 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4665,7 +4665,7 @@ static void init_printer_values(struct service *pService)
  */
 static int max_open_files(void)
 {
-	int sysctl_max;
+	int sysctl_max = MAX_OPEN_FILES;
 	struct rlimit rl;
 	bool sysctl_worked = false, rlimit_worked = false;
 
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 486b5b1..e618b42 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -1947,7 +1947,7 @@ void pdb_search_destroy(struct pdb_search *search)
 }
 
 /*******************************************************************
- trustodm methods
+ trustdom methods
  *******************************************************************/
 
 bool pdb_get_trusteddom_pw(const char *domain, char** pwd, DOM_SID *sid, 
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 28ce80b..49995d8 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -447,7 +447,6 @@ static bool smbd_open_one_socket(struct smbd_parent_context *parent,
 	if (s->fd == -1) {
 		DEBUG(0,("smbd_open_once_socket: open_socket_in: "
 			"%s\n", strerror(errno)));
-			close(s->fd);
 		TALLOC_FREE(s);
 		/*
 		 * We ignore an error here, as we've done before


-- 
Samba Shared Repository