Changeset 745 for trunk/server/libcli/ldap/ldap_ndr.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)
• libcli/ldap/ldap_ndr.c (modified) (4 diffs)

trunk/server/libcli/ldap/ldap_ndr.c

@@ -22 +22 @@
 
 #include "includes.h"
-#include "lib/ldb/include/ldb.h"
+#if _SAMBA_BUILD_ == 3
+#include "lib/ldb_compat.h"
+#else
+#include <ldb.h>
+#endif
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
@@ -48 +52 @@
         enum ndr_err_code ndr_err;
         char *ret;
-        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, sid,
+        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, sid,
                                        (ndr_push_flags_fn_t)ndr_push_dom_sid);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -62 +66 @@
   encode a NDR GUID as a ldap filter element
 */
-char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, struct GUID *guid)
+char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, const struct GUID *guid)
 {
         DATA_BLOB blob;
-        enum ndr_err_code ndr_err;
+        NTSTATUS status;
         char *ret;
-        ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, guid,
-                                       (ndr_push_flags_fn_t)ndr_push_GUID);
-        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+        status = GUID_to_ndr_blob(guid, mem_ctx, &blob);
+        if (!NT_STATUS_IS_OK(status)) {
                 return NULL;
         }
@@ -87 +90 @@
         blob.data = val.data;
         blob.length = val.length;
-        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, guid,
+        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, guid,
                                        (ndr_pull_flags_fn_t)ndr_pull_GUID);
         talloc_free(val.data);