[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  897af93 s3-build Add popt dep to fix build on FreeBSD
       via  bcd6883 lib/util Rename conv_str_size() -> conv_str_size_error()
      from  944929b s4:torture/nbt/winsreplication: use torture macros in order report failures

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


- Log -----------------------------------------------------------------
commit 897af93e3176eb62817325a8b487742034bbbee7
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Apr 30 18:10:17 2011 +1000

    s3-build Add popt dep to fix build on FreeBSD
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Sat Apr 30 11:42:20 CEST 2011 on sn-devel-104

commit bcd68837ee308aa4610a4c85783a4b64a349d4f9
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Apr 30 13:10:18 2011 +1000

    lib/util Rename conv_str_size() -> conv_str_size_error()

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

Summary of changes:
 lib/util/util.h          |    4 +---
 lib/util/util_str.c      |    2 +-
 source3/wscript_build    |    2 +-
 source4/client/cifsdd.c  |    2 +-
 source4/param/loadparm.c |    4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/util.h b/lib/util/util.h
index 8bbaa0e..8dffece 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -371,12 +371,10 @@ _PUBLIC_ bool set_boolean(const char *boolean_string, bool *boolean);
  */
 _PUBLIC_ bool conv_str_bool(const char * str, bool * val);
 
-#if _SAMBA_BUILD_ == 4
 /**
  * Convert a size specification like 16K into an integral number of bytes. 
  **/
-_PUBLIC_ bool conv_str_size(const char * str, uint64_t * val);
-#endif
+_PUBLIC_ bool conv_str_size_error(const char * str, uint64_t * val);
 
 /**
  * Parse a uint64_t value from a string
diff --git a/lib/util/util_str.c b/lib/util/util_str.c
index cf1b07f..cf3d60d 100644
--- a/lib/util/util_str.c
+++ b/lib/util/util_str.c
@@ -175,7 +175,7 @@ _PUBLIC_ bool conv_str_bool(const char * str, bool * val)
 /**
  * Convert a size specification like 16K into an integral number of bytes. 
  **/
-_PUBLIC_ bool conv_str_size(const char * str, uint64_t * val)
+_PUBLIC_ bool conv_str_size_error(const char * str, uint64_t * val)
 {
 	char *		    end = NULL;
 	unsigned long long  lval;
diff --git a/source3/wscript_build b/source3/wscript_build
index 143f90a..0a12bfc 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -676,7 +676,7 @@ bld.SAMBA3_LIBRARY('netapi',
 bld.SAMBA3_LIBRARY('libsmb/smbclient',
                     source=LIBSMBCLIENT_SRC,
                     public_deps='''talloc tdb wbclient cap param LIB_NONSMBD LIBSMB KRBCLIENT passdb SMBLDAP
-                    LIBMSRPC_GEN msrpc3 LIBCLI_LSA3 RPC_NDR_SRVSVC''',
+                    LIBMSRPC_GEN msrpc3 LIBCLI_LSA3 RPC_NDR_SRVSVC POPT_SAMBA3''',
                     public_headers='include/libsmbclient.h',
                     vnum='0',
                     vars=locals())
diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index adf2d72..3ce7277 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -152,7 +152,7 @@ int set_arg_argv(const char * argv)
 			}
 			break;
 		case ARG_SIZE:
-			if (!conv_str_size(val, &arg->arg_val.nval)) {
+			if (!conv_str_size_error(val, &arg->arg_val.nval)) {
 				goto fail;
 			}
 			break;
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index c8c0b19..0f60e43 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -949,7 +949,7 @@ int lpcfg_parm_bytes(struct loadparm_context *lp_ctx,
 
 	const char *value = lpcfg_get_parametric(lp_ctx, service, type, option);
 
-	if (value && conv_str_size(value, &bval)) {
+	if (value && conv_str_size_error(value, &bval)) {
 		if (bval <= INT_MAX) {
 			return (int)bval;
 		}
@@ -1662,7 +1662,7 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr,
 		case P_BYTES:
 		{
 			uint64_t val;
-			if (conv_str_size(pszParmValue, &val)) {
+			if (conv_str_size_error(pszParmValue, &val)) {
 				if (val <= INT_MAX) {
 					*(int *)parm_ptr = (int)val;
 					break;


-- 
Samba Shared Repository