bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added FreeBSD 6.0 sysctl call

Browse Source
This commit is contained in:
Michiel Broek 2007-05-28 10:40:24 +00:00
parent 5a091f11fd
commit 87862deec0
2 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
unix/mbpasswd.c
View File

@ -5,7 +5,7 @@
* Shadow Suite (c) ......: Julianne Frances Haugh * Shadow Suite (c) ......: Julianne Frances Haugh
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2005 * Copyright (C) 1997-2007
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -59,7 +59,11 @@
#include <userconf.h> #include <userconf.h>
#endif #endif
#if defined(__OpenBSD__) || defined(__NetBSD__) #if (defined(__FreeBSD__) && __FreeBSD_version >= 600000)
#define FreeBSD_sysctl 1
#endif
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(FreeBSD_sysctl)
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
@ -855,8 +859,7 @@ int main(int argc, char *argv[])
size_t siz = 100; size_t siz = 100;
char **p; char **p;
int mib[4]; int mib[4];
#elif defined(__NetBSD__) #elif defined(__NetBSD__) || defined(FreeBSD_sysctl)
#define ARG_SIZE 60
static char **s; static char **s;
size_t siz = 100; size_t siz = 100;
int mib[4]; int mib[4];
@ -949,9 +952,27 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
parent = xstrcpy((char *)s); parent = xstrcpy((char *)s);
#elif defined(FreeBSD_sysctl)
/*
* For FreeBSD 6.0 and later.
*/
mib[0] = CTL_KERN;
mib[1] = KERN_PROC;
mib[2] = KERN_PROC_ARGS;
mib[3] = ppid;
if ((s = realloc(s, siz)) == NULL) {
fprintf(stderr, "mbpasswd: no memory\n");
exit(1);
}
if (sysctl(mib, 4, s, &siz, NULL, 0) == -1) {
perror("");
fprintf(stderr, "mbpasswd: sysctl call failed\n");
exit(1);
}
parent = xstrcpy((char *)s);
#else #else
/* /*
* Systems with /proc filesystem like Linux, FreeBSD * Systems with /proc filesystem like Linux, old FreeBSD
*/ */
snprintf(temp, PATH_MAX, "/proc/%d/cmdline", ppid); snprintf(temp, PATH_MAX, "/proc/%d/cmdline", ppid);
if ((fp = fopen(temp, "r")) == NULL) { if ((fp = fopen(temp, "r")) == NULL) {

31
unix/mbuseradd.c
View File

@ -4,7 +4,7 @@
* Purpose ...............: setuid root version of useradd * Purpose ...............: setuid root version of useradd
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2005 * Copyright (C) 1997-2007
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -45,7 +45,11 @@
#include <syslog.h> #include <syslog.h>
#include <time.h> #include <time.h>
#if defined(__OpenBSD__) || defined(__NetBSD__) #if (defined(__FreeBSD__) && __FreeBSD_version >= 600000)
#define FreeBSD_sysctl 1
#endif
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(FreeBSD_sysctl)
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
@ -184,8 +188,7 @@ int main(int argc, char *argv[])
size_t siz = 100; size_t siz = 100;
char **p; char **p;
int mib[4]; int mib[4];
#elif defined(__NetBSD__) #elif defined(__NetBSD__) || defined(FreeBSD_sysctl)
#define ARG_SIZE 60
static char **s; static char **s;
size_t siz = 100; size_t siz = 100;
int mib[4]; int mib[4];
@ -282,9 +285,27 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
parent = xstrcpy((char *)s); parent = xstrcpy((char *)s);
#elif defined(FreeBSD_sysctl)
/*
* For FreeBSD 6.0 and later.
*/
mib[0] = CTL_KERN;
mib[1] = KERN_PROC;
mib[2] = KERN_PROC_ARGS;
mib[3] = ppid;
if ((s = realloc(s, siz)) == NULL) {
fprintf(stderr, "mbuseradd: no memory\n");
exit(1);
}
if (sysctl(mib, 4, s, &siz, NULL, 0) == -1) {
perror("");
fprintf(stderr, "mbuseradd: sysctl call failed\n");
exit(1);
}
parent = xstrcpy((char *)s);
#else #else
/* /*
* Systems with /proc filesystem like Linux, FreeBSD * Systems with /proc filesystem like Linux, old FreeBSD
*/ */
snprintf(temp, PATH_MAX, "/proc/%d/cmdline", ppid); snprintf(temp, PATH_MAX, "/proc/%d/cmdline", ppid);
if ((fp = fopen(temp, "r")) == NULL) { if ((fp = fopen(temp, "r")) == NULL) {