r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need

[ira/wip.git] / source3 / lib / afs.c

diff --git a/source3/lib/afs.c b/source3/lib/afs.c
index 8a304adcf0c80ade7851dc111112e86940cd1781..ea83fdebc254a163282ea183806e4336e18d02e5 100644 (file)
--- a/source3/lib/afs.c
+++ b/source3/lib/afs.c
@@ -211,6 +211,7 @@ char *afs_createtoken_str(const char *username, const char *cell)
 
 BOOL afs_login(connection_struct *conn)
 {
+       extern userdom_struct current_user_info;
        extern struct current_user current_user;
        DATA_BLOB ticket;
        pstring afs_username;
@@ -222,7 +223,11 @@ BOOL afs_login(connection_struct *conn)
        struct ClearToken ct;
 
        pstrcpy(afs_username, lp_afs_username_map());
-       standard_sub_conn(conn, afs_username, sizeof(afs_username));
+       standard_sub_advanced(SNUM(conn), conn->user,
+                             conn->connectpath, conn->gid,
+                             get_current_username(),
+                             current_user_info.domain,
+                             afs_username, sizeof(afs_username));
 
        user_sid = &current_user.nt_user_token->user_sids[0];
        pstring_sub(afs_username, "%s", sid_string_static(user_sid));