updated the 3.0 branch from the head branch - ready for alpha18

[kai/samba.git] / source3 / lib / sysacls.c

diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 22245992f53594064258b8d9785cb3725e6b64bf..00d06e4a5aead067301bc9e8a707ef4d3e346400 100644 (file)
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -644,13 +644,7 @@ char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
                                break;
 
                        case SMB_ACL_USER:
-                               if ((pw = sys_getpwuid(ap->a_id)) == NULL) {
-                                       slprintf(idbuf, sizeof(idbuf)-1, "%ld",
-                                               (long)ap->a_id);
-                                       id = idbuf;
-                               } else {
-                                       id = pw->pw_name;
-                               }
+                               id = uidtoname(ap->a_id);
                        case SMB_ACL_USER_OBJ:
                                tag = "user";
                                break;
@@ -1281,13 +1275,7 @@ char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p)
                                break;
 
                        case SMB_ACL_USER:
-                               if ((pw = sys_getpwuid(ap->a_id)) == NULL) {
-                                       slprintf(idbuf, sizeof(idbuf)-1, "%ld",
-                                               (long)ap->a_id);
-                                       id = idbuf;
-                               } else {
-                                       id = pw->pw_name;
-                               }
+                               id = uidtoname(ap->a_id);
                        case SMB_ACL_USER_OBJ:
                                tag = "user";
                                break;