summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-05-21 11:25:01 +1000
committerGünther Deschner <gd@samba.org>2010-05-21 10:39:59 +0200
commitcba7f8b8273e661d3c43652900d93e5a8eab4e5f (patch)
tree714e00240ddc0c7e689240d2c8fb7d9196b1fff2 /testsuite
parenta92b653af964364ee438c6ee69a87eb7603ceab0 (diff)
downloadsamba-cba7f8b8273e661d3c43652900d93e5a8eab4e5f.tar.gz
samba-cba7f8b8273e661d3c43652900d93e5a8eab4e5f.tar.bz2
samba-cba7f8b8273e661d3c43652900d93e5a8eab4e5f.zip
s3:dom_sid Global replace of DOM_SID with struct dom_sid
This matches the structure that new code is being written to, and removes one more of the old-style named structures, and the need to know that is is just an alias for struct dom_sid. Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/printing/psec.c6
-rw-r--r--testsuite/smbd/se_access_check_utils.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/printing/psec.c b/testsuite/printing/psec.c
index 051837cec9..2438614996 100644
--- a/testsuite/printing/psec.c
+++ b/testsuite/printing/psec.c
@@ -146,7 +146,7 @@ char *ace_to_str(SEC_ACE *ace)
void str_to_ace(SEC_ACE *ace, char *ace_str)
{
SEC_ACCESS sa;
- DOM_SID sid;
+ struct dom_sid sid;
uint32 mask;
uint8 type, flags;
@@ -256,7 +256,7 @@ int psec_getsec(char *printer)
int psec_setsec(char *printer)
{
- DOM_SID user_sid, group_sid;
+ struct dom_sid user_sid, group_sid;
SEC_ACE *ace_list = NULL;
SEC_ACL *dacl = NULL;
SEC_DESC *sd;
@@ -304,7 +304,7 @@ int psec_setsec(char *printer)
int ace_type, ace_flags;
uint32 ace_mask;
fstring sidstr;
- DOM_SID sid;
+ struct dom_sid sid;
SEC_ACCESS sa;
if (sscanf(line, "%d %d 0x%x %s", &ace_type, &ace_flags,
diff --git a/testsuite/smbd/se_access_check_utils.c b/testsuite/smbd/se_access_check_utils.c
index fbd2dab465..cba2ca5012 100644
--- a/testsuite/smbd/se_access_check_utils.c
+++ b/testsuite/smbd/se_access_check_utils.c
@@ -21,7 +21,7 @@
#include "includes.h"
#include "se_access_check_utils.h"
-void char_to_sid(DOM_SID *sid, char *sid_str)
+void char_to_sid(struct dom_sid *sid, char *sid_str)
{
/* If it looks like a SID, call string_to_sid() else look it up
using wbinfo. */
@@ -65,7 +65,7 @@ SEC_ACL *build_acl(struct ace_entry *ace_list)
while(ace_list->sid) {
SEC_ACCESS sa;
- DOM_SID sid;
+ struct dom_sid sid;
/* Create memory for new ACE */
@@ -99,7 +99,7 @@ SEC_ACL *build_acl(struct ace_entry *ace_list)
SEC_DESC *build_sec_desc(struct ace_entry *dacl, struct ace_entry *sacl,
char *owner_sid, char *group_sid)
{
- DOM_SID the_owner_sid, the_group_sid;
+ struct dom_sid the_owner_sid, the_group_sid;
SEC_ACL *the_dacl, *the_sacl;
SEC_DESC *result;
size_t size;