diff options
Diffstat (limited to 'utility.c')
-rw-r--r-- | utility.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -797,12 +797,12 @@ extern int parse_mode(const char *s, mode_t * theMode) | |||
797 | * This uses buf as storage to hold things. | 797 | * This uses buf as storage to hold things. |
798 | * | 798 | * |
799 | */ | 799 | */ |
800 | uid_t my_getid(const char *filename, char *name, uid_t id, gid_t *gid) | 800 | unsigned long my_getid(const char *filename, char *name, unsigned long id, unsigned long *gid) |
801 | { | 801 | { |
802 | FILE *file; | 802 | FILE *file; |
803 | char *rname, *start, *end, buf[128]; | 803 | char *rname, *start, *end, buf[128]; |
804 | id_t rid; | 804 | id_t rid; |
805 | gid_t rgid = 0; | 805 | unsigned long rgid = 0; |
806 | 806 | ||
807 | file = fopen(filename, "r"); | 807 | file = fopen(filename, "r"); |
808 | if (file == NULL) { | 808 | if (file == NULL) { |
@@ -830,13 +830,13 @@ uid_t my_getid(const char *filename, char *name, uid_t id, gid_t *gid) | |||
830 | 830 | ||
831 | /* uid in passwd, gid in group */ | 831 | /* uid in passwd, gid in group */ |
832 | start = end + 1; | 832 | start = end + 1; |
833 | rid = (uid_t) strtol(start, &end, 10); | 833 | rid = (unsigned long) strtol(start, &end, 10); |
834 | if (end == start) | 834 | if (end == start) |
835 | continue; | 835 | continue; |
836 | 836 | ||
837 | /* gid in passwd */ | 837 | /* gid in passwd */ |
838 | start = end + 1; | 838 | start = end + 1; |
839 | rgid = (gid_t) strtol(start, &end, 10); | 839 | rgid = (unsigned long) strtol(start, &end, 10); |
840 | 840 | ||
841 | if (name) { | 841 | if (name) { |
842 | if (0 == strcmp(rname, name)) { | 842 | if (0 == strcmp(rname, name)) { |
@@ -857,33 +857,33 @@ uid_t my_getid(const char *filename, char *name, uid_t id, gid_t *gid) | |||
857 | } | 857 | } |
858 | 858 | ||
859 | /* returns a uid given a username */ | 859 | /* returns a uid given a username */ |
860 | uid_t my_getpwnam(char *name) | 860 | unsigned long my_getpwnam(char *name) |
861 | { | 861 | { |
862 | return my_getid("/etc/passwd", name, -1, NULL); | 862 | return my_getid("/etc/passwd", name, -1, NULL); |
863 | } | 863 | } |
864 | 864 | ||
865 | /* returns a gid given a group name */ | 865 | /* returns a gid given a group name */ |
866 | gid_t my_getgrnam(char *name) | 866 | unsigned long my_getgrnam(char *name) |
867 | { | 867 | { |
868 | return my_getid("/etc/group", name, -1, NULL); | 868 | return my_getid("/etc/group", name, -1, NULL); |
869 | } | 869 | } |
870 | 870 | ||
871 | /* gets a username given a uid */ | 871 | /* gets a username given a uid */ |
872 | void my_getpwuid(char *name, uid_t uid) | 872 | void my_getpwuid(char *name, unsigned long uid) |
873 | { | 873 | { |
874 | my_getid("/etc/passwd", name, uid, NULL); | 874 | my_getid("/etc/passwd", name, uid, NULL); |
875 | } | 875 | } |
876 | 876 | ||
877 | /* gets a groupname given a gid */ | 877 | /* gets a groupname given a gid */ |
878 | void my_getgrgid(char *group, gid_t gid) | 878 | void my_getgrgid(char *group, unsigned long gid) |
879 | { | 879 | { |
880 | my_getid("/etc/group", group, gid, NULL); | 880 | my_getid("/etc/group", group, gid, NULL); |
881 | } | 881 | } |
882 | 882 | ||
883 | /* gets a gid given a user name */ | 883 | /* gets a gid given a user name */ |
884 | gid_t my_getpwnamegid(char *name) | 884 | unsigned long my_getpwnamegid(char *name) |
885 | { | 885 | { |
886 | gid_t gid; | 886 | unsigned long gid; |
887 | my_getid("/etc/passwd", name, -1, &gid); | 887 | my_getid("/etc/passwd", name, -1, &gid); |
888 | return gid; | 888 | return gid; |
889 | } | 889 | } |