- Timestamp:
- Jul 7, 2007, 9:18:46 PM (17 years ago)
- Location:
- trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/sh_gpg.c
r102 r111 292 292 struct stat lbuf; 293 293 int status_stat = 0; 294 struct passwd * tempres = getpwnam(DEFAULT_IDENT); 295 if (!tempres) 296 tempres = sh_getpwnam(DEFAULT_IDENT); 294 struct passwd * tempres = sh_getpwnam(DEFAULT_IDENT); 295 297 296 if (!tempres) 298 297 { … … 953 952 TPT(((0), FIL__, __LINE__, _("msg=<GPG_CHECK: FD1 = %d>\n"), fd1)); 954 953 #if defined(SH_WITH_SERVER) 955 tempres = getpwnam(DEFAULT_IDENT); 956 if (!tempres) 957 tempres = sh_getpwnam(DEFAULT_IDENT); 954 tempres = sh_getpwnam(DEFAULT_IDENT); 955 958 956 if ((tempres != NULL) && (0 == sl_ret_euid())) 959 957 { … … 971 969 TPT(((0), FIL__, __LINE__, _("msg=<GPG_CHECK: FD2 = %d>\n"), fd2)); 972 970 #if defined(SH_WITH_SERVER) 973 tempres = getpwnam(DEFAULT_IDENT); 974 if (!tempres) 975 tempres = sh_getpwnam(DEFAULT_IDENT); 971 tempres = sh_getpwnam(DEFAULT_IDENT); 972 976 973 if ((tempres != NULL) && (0 == sl_ret_euid())) 977 974 { … … 1080 1077 1081 1078 #if defined(SH_WITH_SERVER) 1082 struct passwd * e_tempres = getpwnam(DEFAULT_IDENT); 1083 if (!e_tempres) 1084 e_tempres = sh_getpwnam(DEFAULT_IDENT); 1079 struct passwd * e_tempres = sh_getpwnam(DEFAULT_IDENT); 1080 1085 1081 if ((e_tempres != NULL) && (0 == sl_ret_euid())) 1086 1082 { -
trunk/src/sh_userfiles.c
r68 r111 39 39 #include "sh_hash.h" 40 40 #include "sh_files.h" 41 #define SH_NEED_PWD_GRP 1 42 #include "sh_static.h" 41 43 42 44 #ifdef SH_USE_USERFILES … … 266 268 * getpwent() too */ 267 269 /*@-unrecog@*/ 268 s etpwent();270 sh_setpwent(); 269 271 /*@+unrecog@*/ 270 while( ( cur_user = /*@-unrecog@*/ getpwent()/*@+unrecog@*/ ) != NULL ) {272 while( ( cur_user = /*@-unrecog@*/sh_getpwent()/*@+unrecog@*/ ) != NULL ) { 271 273 int found = 0; 272 274 -
trunk/src/trustfile.c
r76 r111 429 429 /* map user name to UID and compare */ 430 430 #ifdef TRUST_MAIN 431 if ((w = getpwnam(*p)) != NULL && *u == (uid_t)(w->pw_uid) )431 if ((w = sh_getpwnam(*p)) != NULL && *u == (uid_t)(w->pw_uid) ) 432 432 SL_IRETURN(SL_TRUE, _("isingrp")); 433 433 #else … … 445 445 { 446 446 #ifdef TRUST_MAIN 447 if ((w = getpwuid(*u)) != NULL && grp == (gid_t)(w->pw_gid) )447 if ((w = sh_getpwuid(*u)) != NULL && grp == (gid_t)(w->pw_gid) ) 448 448 SL_IRETURN(SL_TRUE, _("isingrp")); 449 449 #else … … 961 961 tf_path[0] = '\0'; 962 962 #if defined(SH_WITH_SERVER) 963 pass = getpwnam(SH_IDENT);963 pass = sh_getpwnam(SH_IDENT); 964 964 if (pass != NULL) 965 965 tf_euid = pass->pw_uid;
Note:
See TracChangeset
for help on using the changeset viewer.