[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  6127ba8 s3fs: make the log warning go away
       via  d4c3f54 tdr: Strip trailing whitespace.
      from  229d934 s4-libnet: Fix setting the group handle and return codes.

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


- Log -----------------------------------------------------------------
commit 6127ba853b8288be60adc70bc0ea084f26e216f7
Author: Ricky Nance <ricky.nance at weaubleau.k12.mo.us>
Date:   Thu Dec 13 20:52:46 2012 -0600

    s3fs: make the log warning go away
    
    standard input is not a socket, assuming -D option
    
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    
    Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date(master): Sat Dec 15 17:50:23 CET 2012 on sn-devel-104

commit d4c3f54bbf6053783a221da84b5dbf249cdf05e7
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Oct 26 06:55:04 2012 -0800

    tdr: Strip trailing whitespace.

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

Summary of changes:
 file_server/file_server.c |    1 +
 lib/tdr/tdr.c             |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/file_server/file_server.c b/file_server/file_server.c
index 430782c..5d44d5a 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -67,6 +67,7 @@ static void s3fs_task_init(struct task_server *task)
 	/* start it as a child process */
 	subreq = samba_runcmd_send(task, task->event_ctx, timeval_zero(), 1, 0,
 				smbd_cmd,
+				"-D",
 				"--option=server role check:inhibit=yes",
 				"--foreground",
 				debug_get_output_is_stdout()?"--log-stdout":NULL,
diff --git a/lib/tdr/tdr.c b/lib/tdr/tdr.c
index 616cc98..95ef982 100644
--- a/lib/tdr/tdr.c
+++ b/lib/tdr/tdr.c
@@ -1,21 +1,21 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    TDR (Trivial Data Representation) helper functions
      Based loosely on ndr.c by Andrew Tridgell.
 
    Copyright (C) Jelmer Vernooij 2005
-   
+
    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 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -162,7 +162,7 @@ NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v,
 	}
 
 	TDR_PULL_NEED_BYTES(tdr, el_size*length);
-	
+
 	if (!convert_string_talloc(ctx, chset, CH_UNIX, tdr->data.data+tdr->offset, el_size*length, discard_const_p(void *, v), &ret)) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
@@ -193,9 +193,9 @@ NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length,
 	if (size < required) {
 		memset(tdr->data.data+tdr->data.length+size, 0, required-size);
 	}
-	
+
 	tdr->data.length += required;
-						 
+
 	return NT_STATUS_OK;
 }
 
@@ -297,7 +297,7 @@ NTSTATUS tdr_print_DATA_BLOB(struct tdr_print *tdr, const char *name, DATA_BLOB
 #define TDR_ALIGN(l,n) (((l) & ((n)-1)) == 0?0:((n)-((l)&((n)-1))))
 
 /*
-  push a DATA_BLOB onto the wire. 
+  push a DATA_BLOB onto the wire.
 */
 NTSTATUS tdr_push_DATA_BLOB(struct tdr_push *tdr, DATA_BLOB *blob)
 {
@@ -310,13 +310,13 @@ NTSTATUS tdr_push_DATA_BLOB(struct tdr_push *tdr, DATA_BLOB *blob)
 	}
 
 	TDR_PUSH_NEED_BYTES(tdr, blob->length);
-	
+
 	memcpy(tdr->data.data+tdr->data.length, blob->data, blob->length);
 	return NT_STATUS_OK;
 }
 
 /*
-  pull a DATA_BLOB from the wire. 
+  pull a DATA_BLOB from the wire.
 */
 NTSTATUS tdr_pull_DATA_BLOB(struct tdr_pull *tdr, TALLOC_CTX *ctx, DATA_BLOB *blob)
 {


-- 
Samba Shared Repository