The branch, master has been updated
via 91f3515 s3-param Avoid strupper_m() where possible.
via 77c612f s4-librpc Remove unsued server_id4.idl
from 73cbcd9 s4-drs: added debug lines for missing linked attribute
fields
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 91f351568aab728269cdfce3a6cfad8b5785b8d8
Author: Andrew Bartlett <abart...@samba.org>
Date: Fri Jun 10 09:37:06 2011 +1000
s3-param Avoid strupper_m() where possible.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abart...@samba.org>
Autobuild-Date: Fri Jun 10 04:37:54 CEST 2011 on sn-devel-104
commit 77c612fc21da944aa6c84e52c127713fcaf9a071
Author: Andrew Bartlett <abart...@samba.org>
Date: Fri Jun 10 09:36:37 2011 +1000
s4-librpc Remove unsued server_id4.idl
-----------------------------------------------------------------------
Summary of changes:
source3/param/loadparm.c | 17 ++++++++++++-----
source4/librpc/idl/server_id4.idl | 13 -------------
2 files changed, 12 insertions(+), 18 deletions(-)
delete mode 100644 source4/librpc/idl/server_id4.idl
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3ba5312..c80b751 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7135,10 +7135,14 @@ static void copy_service(struct service *pserviceDest,
struct service *pserviceS
break;
case P_USTRING:
+ {
+ char *upper_string =
strupper_talloc(talloc_tos(),
+
*(char **)src_ptr);
string_set((char **)dest_ptr,
- *(char **)src_ptr);
- strupper_m(*(char **)dest_ptr);
+ upper_string);
+ TALLOC_FREE(upper_string);
break;
+ }
case P_LIST:
TALLOC_FREE(*((char ***)dest_ptr));
*((char ***)dest_ptr) =
str_list_copy(NULL,
@@ -8007,10 +8011,13 @@ bool lp_do_parameter(int snum, const char *pszParmName,
const char *pszParmValue
break;
case P_USTRING:
- string_set((char **)parm_ptr, pszParmValue);
- strupper_m(*(char **)parm_ptr);
+ {
+ char *upper_string = strupper_talloc(talloc_tos(),
+ pszParmValue);
+ string_set((char **)parm_ptr, upper_string);
+ TALLOC_FREE(upper_string);
break;
-
+ }
case P_ENUM:
lp_set_enum_parm( &parm_table[parmnum], pszParmValue,
(int*)parm_ptr );
break;
diff --git a/source4/librpc/idl/server_id4.idl
b/source4/librpc/idl/server_id4.idl
deleted file mode 100644
index eb191e3..0000000
--- a/source4/librpc/idl/server_id4.idl
+++ /dev/null
@@ -1,13 +0,0 @@
-[
- pointer_default(unique)
-]
-interface server_id
-{
- /* id used to identify a endpoint, possibly in a cluster */
- typedef [public] struct {
- hyper pid;
- uint32 task_id;
- uint32 vnn;
- udlong unique_id;
- } server_id;
-}
--
Samba Shared Repository
