diff options
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/display_sec.c | 6 | ||||
| -rw-r--r-- | source3/lib/privileges.c | 4 | ||||
| -rw-r--r-- | source3/lib/smbldap_util.c | 2 | ||||
| -rw-r--r-- | source3/lib/substitute.c | 2 | ||||
| -rw-r--r-- | source3/lib/util_sid.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/source3/lib/display_sec.c b/source3/lib/display_sec.c index caa13a6a5e..f6a6bb6465 100644 --- a/source3/lib/display_sec.c +++ b/source3/lib/display_sec.c @@ -151,7 +151,7 @@ void display_sec_ace(SEC_ACE *ace) printf(" (%d) flags: 0x%02x ", ace->type, ace->flags); display_sec_ace_flags(ace->flags); display_sec_access(&ace->access_mask); - sid_to_string(sid_str, &ace->trustee); + sid_to_fstring(sid_str, &ace->trustee); printf("\t\tSID: %s\n\n", sid_str); if (sec_ace_object(ace->type)) { @@ -246,12 +246,12 @@ void display_sec_desc(SEC_DESC *sec) } if (sec->owner_sid) { - sid_to_string(sid_str, sec->owner_sid); + sid_to_fstring(sid_str, sec->owner_sid); printf("\tOwner SID:\t%s\n", sid_str); } if (sec->group_sid) { - sid_to_string(sid_str, sec->group_sid); + sid_to_fstring(sid_str, sec->group_sid); printf("\tGroup SID:\t%s\n", sid_str); } } diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c index 9f155acd8b..63fb462e32 100644 --- a/source3/lib/privileges.c +++ b/source3/lib/privileges.c @@ -54,7 +54,7 @@ static bool get_privileges( const DOM_SID *sid, SE_PRIV *mask ) /* PRIV_<SID> (NULL terminated) as the key */ - fstr_sprintf(keystr, "%s%s", PRIVPREFIX, sid_to_string(tmp, sid)); + fstr_sprintf(keystr, "%s%s", PRIVPREFIX, sid_to_fstring(tmp, sid)); data = tdb_fetch_bystring( tdb, keystr ); @@ -95,7 +95,7 @@ static bool set_privileges( const DOM_SID *sid, SE_PRIV *mask ) /* PRIV_<SID> (NULL terminated) as the key */ - fstr_sprintf(keystr, "%s%s", PRIVPREFIX, sid_to_string(tmp, sid)); + fstr_sprintf(keystr, "%s%s", PRIVPREFIX, sid_to_fstring(tmp, sid)); /* no packing. static size structure, just write it out */ diff --git a/source3/lib/smbldap_util.c b/source3/lib/smbldap_util.c index 42861ae111..66aef6ba66 100644 --- a/source3/lib/smbldap_util.c +++ b/source3/lib/smbldap_util.c @@ -192,7 +192,7 @@ static NTSTATUS add_new_domain_info(struct smbldap_state *ldap_state, /* If we don't have an entry, then ask secrets.tdb for what it thinks. It may choose to make it up */ - sid_to_string(sid_string, get_global_sam_sid()); + sid_to_fstring(sid_string, get_global_sam_sid()); smbldap_set_mod(&mods, LDAP_MOD_ADD, get_attr_key2string(dominfo_attr_list, LDAP_ATTR_DOM_SID), diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index 3fbdd2859e..e06917c8fb 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -309,7 +309,7 @@ static char *longvar_domainsid( void ) return NULL; } - sid_string = SMB_STRDUP( sid_to_string( tmp, &sid ) ); + sid_string = SMB_STRDUP( sid_to_fstring( tmp, &sid ) ); if ( !sid_string ) { DEBUG(0,("longvar_domainsid: failed to dup SID string!\n")); diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c index 868ac36d11..52f65aa77d 100644 --- a/source3/lib/util_sid.c +++ b/source3/lib/util_sid.c @@ -172,7 +172,7 @@ const char *get_global_sam_name(void) Convert a SID to an ascii string. *****************************************************************/ -char *sid_to_string(fstring sidstr_out, const DOM_SID *sid) +char *sid_to_fstring(fstring sidstr_out, const DOM_SID *sid) { char *str = sid_string_talloc(talloc_tos(), sid); fstrcpy(sidstr_out, str); |