summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2007-12-15 22:47:30 +0100
committerVolker Lendecke <vl@samba.org>2007-12-15 22:47:30 +0100
commit2e07c2ade89f4ff281c61f74cb88e09990cf5f46 (patch)
treea1fb43117e5b3966c8113d47c37a1bdf1e8ee30b /source3/libsmb
parent79cd97cc3f496f781d809c1ab619afa2cc07293d (diff)
downloadsamba-2e07c2ade89f4ff281c61f74cb88e09990cf5f46.tar.gz
samba-2e07c2ade89f4ff281c61f74cb88e09990cf5f46.tar.bz2
samba-2e07c2ade89f4ff281c61f74cb88e09990cf5f46.zip
s/sid_to_string/sid_to_fstring/
least surprise for callers (This used to be commit eb523ba77697346a365589101aac379febecd546)
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/cliquota.c2
-rw-r--r--source3/libsmb/libsmbclient.c2
-rw-r--r--source3/libsmb/samlogon_cache.c8
-rw-r--r--source3/libsmb/trustdom_cache.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c
index 3c794240bc..206576f040 100644
--- a/source3/libsmb/cliquota.c
+++ b/source3/libsmb/cliquota.c
@@ -608,7 +608,7 @@ void dump_ntquota(SMB_NTQUOTA_STRUCT *qt, bool _verbose, bool _numeric, void (*_
if (_sidtostring) {
_sidtostring(username_str,&qt->sid,_numeric);
} else {
- sid_to_string(username_str, &qt->sid);
+ sid_to_fstring(username_str, &qt->sid);
}
if (_verbose) {
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index 9b8d5edb4a..2ff2830256 100644
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -4136,7 +4136,7 @@ convert_sid_to_string(struct cli_state *ipc_cli,
struct rpc_pipe_client *pipe_hnd = find_lsa_pipe_hnd(ipc_cli);
TALLOC_CTX *ctx;
- sid_to_string(str, sid);
+ sid_to_fstring(str, sid);
if (numeric) {
return; /* no lookup desired */
diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index a15a3b228d..4f791f66f6 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -81,7 +81,7 @@ void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
/* Clear U/SID cache entry */
- fstr_sprintf(key_str, "U/%s", sid_to_string(sid_string, &sid));
+ fstr_sprintf(key_str, "U/%s", sid_to_fstring(sid_string, &sid));
DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key_str));
@@ -89,7 +89,7 @@ void netsamlogon_clear_cached_user(TDB_CONTEXT *tdb, NET_USER_INFO_3 *user)
/* Clear UG/SID cache entry */
- fstr_sprintf(key_str, "UG/%s", sid_to_string(sid_string, &sid));
+ fstr_sprintf(key_str, "UG/%s", sid_to_fstring(sid_string, &sid));
DEBUG(10, ("netsamlogon_clear_cached_user: clearing %s\n", key_str));
@@ -124,7 +124,7 @@ bool netsamlogon_cache_store( const char *username, NET_USER_INFO_3 *user )
sid_append_rid( &user_sid, user->user_rid );
/* Prepare key as DOMAIN-SID/USER-RID string */
- slprintf(keystr, sizeof(keystr), "%s", sid_to_string(tmp, &user_sid));
+ slprintf(keystr, sizeof(keystr), "%s", sid_to_fstring(tmp, &user_sid));
DEBUG(10,("netsamlogon_cache_store: SID [%s]\n", keystr));
@@ -186,7 +186,7 @@ NET_USER_INFO_3* netsamlogon_cache_get( TALLOC_CTX *mem_ctx, const DOM_SID *user
}
/* Prepare key as DOMAIN-SID/USER-RID string */
- slprintf(keystr, sizeof(keystr), "%s", sid_to_string(tmp, user_sid));
+ slprintf(keystr, sizeof(keystr), "%s", sid_to_fstring(tmp, user_sid));
DEBUG(10,("netsamlogon_cache_get: SID [%s]\n", keystr));
data = tdb_fetch_bystring( netsamlogon_tdb, keystr );
diff --git a/source3/libsmb/trustdom_cache.c b/source3/libsmb/trustdom_cache.c
index 498a0221f2..6755de3814 100644
--- a/source3/libsmb/trustdom_cache.c
+++ b/source3/libsmb/trustdom_cache.c
@@ -129,7 +129,7 @@ bool trustdom_cache_store(char* name, char* alt_name, const DOM_SID *sid,
alt_key = alt_name ? trustdom_cache_key(alt_name) : NULL;
/* Generate string representation domain SID */
- sid_to_string(sid_string, sid);
+ sid_to_fstring(sid_string, sid);
/*
* try to put the names in the cache