Changeset 590 for trunk/server/source3/rpc_client

Timestamp:

Jul 1, 2011, 8:40:10 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.6

Location:

trunk/server/source3/rpc_client

Files:

• cli_pipe.c (modified) (2 diffs)
• init_spoolss.c (modified) (1 diff)

trunk/server/source3/rpc_client/cli_pipe.c

@@ -3214 +3214 @@
         result->a_u.schannel_auth->seq_num = 0;
         result->a_u.schannel_auth->initiator = true;
-        result->a_u.schannel_auth->creds = creds;
+        result->a_u.schannel_auth->creds = netlogon_creds_copy(result, creds);
 
         *presult = result;
@@ -4045 +4045 @@
         /*
          * The credentials on a new netlogon pipe are the ones we are passed
-         * in - reference them in
+         * in - copy them over
          */
-        result->dc = talloc_move(result, pdc);
+        result->dc = netlogon_creds_copy(result, *pdc);
+        if (result->dc == NULL) {
+                TALLOC_FREE(result);
+                return NT_STATUS_NO_MEMORY;
+        }
 
         DEBUG(10,("cli_rpc_pipe_open_schannel_with_key: opened pipe %s to machine %s "

trunk/server/source3/rpc_client/init_spoolss.c

@@ -74 +74 @@
         return WERR_OK;
 }
+
+/*******************************************************************
+ ********************************************************************/
+
+void spoolss_printerinfo2_to_setprinterinfo2(const struct spoolss_PrinterInfo2 *i,
+                                             struct spoolss_SetPrinterInfo2 *s)
+{
+        s->servername           = i->servername;
+        s->printername          = i->printername;
+        s->sharename            = i->sharename;
+        s->portname             = i->portname;
+        s->drivername           = i->drivername;
+        s->comment              = i->comment;
+        s->location             = i->location;
+        s->devmode_ptr          = 0;
+        s->sepfile              = i->sepfile;
+        s->printprocessor       = i->printprocessor;
+        s->datatype             = i->datatype;
+        s->parameters           = i->parameters;
+        s->secdesc_ptr          = 0;
+        s->attributes           = i->attributes;
+        s->priority             = i->priority;
+        s->defaultpriority      = i->defaultpriority;
+        s->starttime            = i->starttime;
+        s->untiltime            = i->untiltime;
+        s->status               = i->status;
+        s->cjobs                = i->cjobs;
+        s->averageppm           = i->averageppm;
+}