Changeset 988 for vendor/current/source4/ntptr

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source4/ntptr

Files:

• ntptr_base.c (modified) (2 diffs)
• simple_ldb/ntptr_simple_ldb.c (modified) (9 diffs)
• wscript_build (modified) (2 diffs)

vendor/current/source4/ntptr/ntptr_base.c

@@ -26 +26 @@
 #include "ntptr/ntptr.h"
 #include "param/param.h"
+#include "lib/util/samba_modules.h"
 
 /* the list of currently registered NTPTR backends */
@@ -69 +70 @@
 }
 
-NTSTATUS ntptr_init(struct loadparm_context *lp_ctx)
+NTSTATUS ntptr_init(void)
 {
 #define _MODULE_PROTO(init) extern NTSTATUS init(void);
         STATIC_ntptr_MODULES_PROTO;
         init_module_fn static_init[] = { STATIC_ntptr_MODULES };
-        init_module_fn *shared_init = load_samba_modules(NULL, lp_ctx, "ntptr");
+        init_module_fn *shared_init = load_samba_modules(NULL, "ntptr");
 
         run_init_functions(static_init);

vendor/current/source4/ntptr/simple_ldb/ntptr_simple_ldb.c

@@ -41 +41 @@
 #include "param/param.h"
 
+NTSTATUS ntptr_simple_ldb_init(void);
+
 /*
   connect to the SPOOLSS database
@@ -47 +49 @@
 static struct ldb_context *sptr_db_connect(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx)
 {
-        return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, lpcfg_spoolss_url(lp_ctx), system_session(lp_ctx),
+        return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, "spoolss.ldb", system_session(lp_ctx),
                                 NULL, 0);
 }
@@ -318 +320 @@
          */
 
-        switch (r->in.level) {
+        switch (r->in.info_ctr->level) {
         case 1:
-                if (!r->in.info.info1) {
+                if (!r->in.info_ctr->info.info1) {
                         return WERR_FOOBAR;
                 }
@@ -326 +328 @@
                                        ldb_dn_new(mem_ctx, sptr_db, "CN=Forms,CN=PrintServer"),
                                        &msgs, attrs, "(&(form-name=%s)(objectClass=form))",
-                                       r->in.info.info1->form_name);
+                                       r->in.info_ctr->info.info1->form_name);
 
                 if (count == 1) return WERR_FOOBAR;
@@ -332 +334 @@
                 if (count < 0) return WERR_GENERAL_FAILURE;
 
-                if (r->in.info.info1->flags != SPOOLSS_FORM_USER) {
+                if (r->in.info_ctr->info.info1->flags != SPOOLSS_FORM_USER) {
                         return WERR_FOOBAR;
                 }
@@ -340 +342 @@
 
                 /* add core elements to the ldb_message for the Form */
-                msg->dn = ldb_dn_new_fmt(msg, sptr_db, "form-name=%s,CN=Forms,CN=PrintServer", r->in.info.info1->form_name);
+                msg->dn = ldb_dn_new_fmt(msg, sptr_db, "form-name=%s,CN=Forms,CN=PrintServer", r->in.info_ctr->info.info1->form_name);
                 SET_STRING(sptr_db, msg, "objectClass", "form");
 
-                SET_UINT(sptr_db, msg, "flags", r->in.info.info1->flags);
-
-                SET_STRING(sptr_db, msg, "form-name", r->in.info.info1->form_name);
-
-                SET_UINT(sptr_db, msg, "size-width", r->in.info.info1->size.width);
-                SET_UINT(sptr_db, msg, "size-height", r->in.info.info1->size.height);
-
-                SET_UINT(sptr_db, msg, "area-left", r->in.info.info1->area.left);
-                SET_UINT(sptr_db, msg, "area-top", r->in.info.info1->area.top);
-                SET_UINT(sptr_db, msg, "area-right", r->in.info.info1->area.right);
-                SET_UINT(sptr_db, msg, "area-bottom", r->in.info.info1->area.bottom);
+                SET_UINT(sptr_db, msg, "flags", r->in.info_ctr->info.info1->flags);
+
+                SET_STRING(sptr_db, msg, "form-name", r->in.info_ctr->info.info1->form_name);
+
+                SET_UINT(sptr_db, msg, "size-width", r->in.info_ctr->info.info1->size.width);
+                SET_UINT(sptr_db, msg, "size-height", r->in.info_ctr->info.info1->size.height);
+
+                SET_UINT(sptr_db, msg, "area-left", r->in.info_ctr->info.info1->area.left);
+                SET_UINT(sptr_db, msg, "area-top", r->in.info_ctr->info.info1->area.top);
+                SET_UINT(sptr_db, msg, "area-right", r->in.info_ctr->info.info1->area.right);
+                SET_UINT(sptr_db, msg, "area-bottom", r->in.info_ctr->info.info1->area.bottom);
                 break;
         default:
@@ -382 +384 @@
          */
 
-        switch (r->in.level) {
+        switch (r->in.info_ctr->level) {
         case 1:
-                if (!r->in.info.info1) {
+                if (!r->in.info_ctr->info.info1) {
                         return WERR_FOOBAR;
                 }
@@ -391 +393 @@
                                        ldb_dn_new(mem_ctx, sptr_db, "CN=Forms,CN=PrintServer"),
                                        &msgs, attrs, "(&(form-name=%s)(objectClass=form))",
-                                       r->in.info.info1->form_name);
+                                       r->in.info_ctr->info.info1->form_name);
 
                 if (count == 0) return WERR_FOOBAR;
@@ -408 +410 @@
                 msg->dn = msgs[0]->dn;
 
-                SET_UINT(sptr_db, msg, "flags", r->in.info.info1->flags);
-
-                SET_STRING(sptr_db, msg, "form-name", r->in.info.info1->form_name);
-
-                SET_UINT(sptr_db, msg, "size-width", r->in.info.info1->size.width);
-                SET_UINT(sptr_db, msg, "size-height", r->in.info.info1->size.height);
-
-                SET_UINT(sptr_db, msg, "area-left", r->in.info.info1->area.left);
-                SET_UINT(sptr_db, msg, "area-top", r->in.info.info1->area.top);
-                SET_UINT(sptr_db, msg, "area-right", r->in.info.info1->area.right);
-                SET_UINT(sptr_db, msg, "area-bottom", r->in.info.info1->area.bottom);
+                SET_UINT(sptr_db, msg, "flags", r->in.info_ctr->info.info1->flags);
+
+                SET_STRING(sptr_db, msg, "form-name", r->in.info_ctr->info.info1->form_name);
+
+                SET_UINT(sptr_db, msg, "size-width", r->in.info_ctr->info.info1->size.width);
+                SET_UINT(sptr_db, msg, "size-height", r->in.info_ctr->info.info1->size.height);
+
+                SET_UINT(sptr_db, msg, "area-left", r->in.info_ctr->info.info1->area.left);
+                SET_UINT(sptr_db, msg, "area-top", r->in.info_ctr->info.info1->area.top);
+                SET_UINT(sptr_db, msg, "area-right", r->in.info_ctr->info.info1->area.right);
+                SET_UINT(sptr_db, msg, "area-bottom", r->in.info_ctr->info.info1->area.bottom);
                 break;
         default:

vendor/current/source4/ntptr/wscript_build

@@ -5 +5 @@
         subsystem='ntptr',
         init_function='ntptr_simple_ldb_init',
-        deps='ldb NDR_SPOOLSS DCERPC_COMMON ldbsamba'
+        deps='ldb NDR_SPOOLSS DCERPC_COMMON ldbsamba',
+        enabled=bld.AD_DC_BUILD_IS_ENABLED()
         )
 
@@ -12 +13 @@
         source='ntptr_base.c ntptr_interface.c',
         autoproto='ntptr_proto.h',
-        public_deps='DCERPC_COMMON'
+        public_deps='DCERPC_COMMON',
+        enabled=bld.AD_DC_BUILD_IS_ENABLED()
         )