Changeset 989 for vendor/current/source3/rpc_server

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/source3/rpc_server

Files:

• mdssd.c (modified) (1 diff)
• mdssvc/mdssvc.c (modified) (1 diff)
• mdssvc/sparql_parser.c (modified) (1 diff)
• rpc_ncacn_np.c (modified) (2 diffs)
• spoolss/srv_spoolss_nt.c (modified) (2 diffs)

vendor/current/source3/rpc_server/mdssd.c

@@ -668 +668 @@
         }
 
-        status = reinit_after_fork(msg_ctx, ev_ctx, true, "mdssd-master");
+        status = smbd_reinit_after_fork(msg_ctx, ev_ctx, true, "mdssd-master");
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0,("reinit_after_fork() failed\n"));

vendor/current/source3/rpc_server/mdssvc/mdssvc.c

@@ -1784 +1784 @@
 
 /**
- * Init callbacks at startup, nothing to do here really
+ * Init callbacks at startup
  **/
 bool mds_init(struct messaging_context *msg_ctx)
 {
+#if (GLIB_MAJOR_VERSION < 3) && (GLIB_MINOR_VERSION < 36)
+        g_type_init();
+#endif
         return true;
 }

vendor/current/source3/rpc_server/mdssvc/sparql_parser.c

@@ -242 +242 @@
 
 #ifndef YY_ATTRIBUTE
-# if (defined __GNUC__                                               \
-      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
-     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+# if HAVE___ATTRIBUTE__
 #  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
 # else

vendor/current/source3/rpc_server/rpc_ncacn_np.c

@@ -710 +710 @@
         }
 
-        ev_ctx = s3_tevent_context_init(tmp_ctx);
+        ev_ctx = samba_tevent_context_init(tmp_ctx);
         if (ev_ctx == NULL) {
-                DEBUG(0, ("s3_tevent_context_init failed\n"));
+                DEBUG(0, ("samba_tevent_context_init failed\n"));
                 status = NT_STATUS_NO_MEMORY;
                 goto out;
@@ -818 +818 @@
         }
 
-        ev = s3_tevent_context_init(talloc_tos());
+        ev = samba_tevent_context_init(talloc_tos());
         if (ev == NULL) {
-                DEBUG(0, ("s3_tevent_context_init failed\n"));
+                DEBUG(0, ("samba_tevent_context_init failed\n"));
                 goto fail;
         }

vendor/current/source3/rpc_server/spoolss/srv_spoolss_nt.c

@@ -705 +705 @@
         if (!found) {
                 gencache_set(cache_key, printer_not_found,
-                             time_mono(NULL) + 300);
+                             time(NULL) + 300);
                 TALLOC_FREE(cache_key);
                 DEBUGADD(4,("Printer not found\n"));
@@ -711 +711 @@
         }
 
-        gencache_set(cache_key, sname, time_mono(NULL) + 300);
+        gencache_set(cache_key, sname, time(NULL) + 300);
         TALLOC_FREE(cache_key);