Author: mimir
Date: 2004-10-07 13:26:13 +0000 (Thu, 07 Oct 2004)
New Revision: 2838

WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/source/include&rev=2838&nolog=1

Log:
Big patch. Switch from secrets_* functions to new trust passwords
api integrated with passdb interface.

- helper macro for rpc calls using channel type parameter
- use DATA_BLOB for various trust passwords rather than fstring


rafal

Modified:
   trunk/source/include/passdb.h
   trunk/source/include/secrets.h


Changeset:
Modified: trunk/source/include/passdb.h
===================================================================
--- trunk/source/include/passdb.h       2004-10-07 11:01:13 UTC (rev 2837)
+++ trunk/source/include/passdb.h       2004-10-07 13:26:13 UTC (rev 2838)
@@ -262,7 +262,7 @@
                uint16 flags;                   /* flags */
                size_t uni_name_len;            /* unicode name length */
                smb_ucs2_t uni_name[32];        /* unicode domain name */
-               fstring pass;                   /* trust password */
+               DATA_BLOB pass;                 /* trust password */
                time_t mod_time;                /* last change time */
                DOM_SID domain_sid;             /* trusted domain sid */
        } private;

Modified: trunk/source/include/secrets.h
===================================================================
--- trunk/source/include/secrets.h      2004-10-07 11:01:13 UTC (rev 2837)
+++ trunk/source/include/secrets.h      2004-10-07 13:26:13 UTC (rev 2838)
@@ -63,6 +63,11 @@
 #define PASS_MACHINE_TRUST_ADS      (PASS_TRUST_ADS | PASS_TRUST_MACHINE)
 #define PASS_DOMAIN_TRUST_ADS       (PASS_TRUST_ADS | PASS_TRUST_DOMAIN)
 
+/* Returns secure channel parameter, based on trust flags, for rpc netlogon calls */
+#define SCHANNEL_TYPE(flags) ((flags & PASS_TRUST_MACHINE) ? SEC_CHAN_WKSTA : \
+                             ((flags & PASS_TRUST_SERVER) ? SEC_CHAN_BDC : \
+                              ((flags & PASS_TRUST_DOMAIN) ? SEC_CHAN_DOMAIN : 0)))
+
 #define SECRETS_PASSWORDS_MIGRATED  "SECRETS/PASS_MIGRATED"
 
 /* structure for storing machine account password

Reply via email to