Changeset 745 for trunk/server/source3/modules/vfs_xattr_tdb.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/vfs_xattr_tdb.c (modified) (7 diffs)

trunk/server/source3/modules/vfs_xattr_tdb.c

@@ -19 +19 @@
 
 #include "includes.h"
+
+
 #include "librpc/gen_ndr/xattr.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
+
+
+
 
 #undef DBGC_CLASS
@@ -48 +53 @@
         blob = data_blob_const(data->dptr, data->dsize);
 
-        ndr_err = ndr_pull_struct_blob(
-                &blob, result, NULL, result,
+        ndr_err = ndr_pull_struct_blob(&blob, result, result,
                 (ndr_pull_flags_fn_t)ndr_pull_tdb_xattrs);
 
@@ -56 +60 @@
                           ndr_errstr(ndr_err)));
                 TALLOC_FREE(result);
-                return ndr_map_error2ntstatus(ndr_err);;
+                return ndr_map_error2ntstatus(ndr_err);
         }
 
@@ -74 +78 @@
         enum ndr_err_code ndr_err;
 
-        ndr_err = ndr_push_struct_blob(
-                &blob, mem_ctx, NULL, attribs,
+        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, attribs,
                 (ndr_push_flags_fn_t)ndr_push_tdb_xattrs);
 
@@ -81 +84 @@
                 DEBUG(0, ("ndr_push_tdb_xattrs failed: %s\n",
                           ndr_errstr(ndr_err)));
-                return ndr_map_error2ntstatus(ndr_err);;
+                return ndr_map_error2ntstatus(ndr_err);
         }
 
@@ -725 +728 @@
                           const char *user)
 {
-        fstring sname;
+        ;
         int res, snum;
         struct db_context *db;
@@ -734 +737 @@
         }
 
-        fstrcpy(sname, service);
-        snum = find_service(sname);
-        if (snum == -1) {
+        snum = find_service(talloc_tos(), service, &sname);
+        if (snum == -1 || sname == NULL) {
                 /*
                  * Should not happen, but we should not fail just *here*.