From 5a8a11c88d7fee8a14750a60341658306e12c2d2 Mon Sep 17 00:00:00 2001 From: albert <> Date: Tue, 20 Jul 2004 22:51:22 +0000 Subject: [PATCH] neaten up some code --- proc/module.mk | 2 +- proc/pwcache.c | 10 ++++++---- sysctl.conf | 5 ++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/proc/module.mk b/proc/module.mk index 929ea2af..97ad99d7 100644 --- a/proc/module.mk +++ b/proc/module.mk @@ -74,7 +74,7 @@ DIRS += proc/ proc/$(ANAME): $(LIBOBJ) $(AR) rcs $@ $^ -#proc/$(SONAME): proc/library.map +proc/$(SONAME): proc/library.map proc/$(SONAME): $(LIBOBJ) $(CC) -shared -Wl,-soname,$(SONAME) -Wl,--version-script=proc/library.map -o $@ $^ -lc diff --git a/proc/pwcache.c b/proc/pwcache.c index 19b64c01..e853dcc2 100644 --- a/proc/pwcache.c +++ b/proc/pwcache.c @@ -42,8 +42,9 @@ char *user_from_uid(uid_t uid) } *p = (struct pwbuf *) xmalloc(sizeof(struct pwbuf)); (*p)->uid = uid; - if ((pw = getpwuid(uid)) == NULL) - sprintf((*p)->name, "#%d", uid); + pw = getpwuid(uid); + if (!pw) + sprintf((*p)->name, "%d", uid); else sprintf((*p)->name, "%-." NAMELENGTH "s", pw->pw_name); (*p)->next = NULL; @@ -69,8 +70,9 @@ char *group_from_gid(gid_t gid) } *g = (struct grpbuf *) malloc(sizeof(struct grpbuf)); (*g)->gid = gid; - if ((gr = getgrgid(gid)) == NULL) - sprintf((*g)->name, "#%d", gid); + gr = getgrgid(gid); + if (!gr) + sprintf((*g)->name, "%d", gid); else sprintf((*g)->name, "%-." NAMELENGTH "s", gr->gr_name); (*g)->next = NULL; diff --git a/sysctl.conf b/sysctl.conf index 9cb38d4a..64586100 100644 --- a/sysctl.conf +++ b/sysctl.conf @@ -10,9 +10,12 @@ net/ipv4/conf/all/accept_redirects=0 net/ipv4/conf/all/accept_source_route=0 net/ipv4/icmp_echo_ignore_broadcasts =1 #net/ipv4/ip_forward=1 -#net.ipv4.tcp_ecn = 0 #net.ipv4.ip_local_port_range = 32768 61000 +# Broken routers will corrupt the window scaling and ECN +#net.ipv4.tcp_default_win_scale = 0 +#net.ipv4.tcp_ecn = 0 + #vm.vfs_cache_pressure = 100 #vm.laptop_mode = 0 #vm.swappiness = 60