about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--sysdeps/unix/sysv/linux/setrlimit.c8
2 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d3c331e3e..a04c827f74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1999-11-11  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/sysv/linux/setrlimit.c: COrrectly use rlimits.
+
+1999-11-09  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/unix/getlogin_r.c (getlogin_r): Sync with getlogin
+	implementation for ttyname_r call; fix inverted condition; return
+	ut_user.
+        Closes PR libc/1438.
+
 1999-11-10  Ulrich Drepper  <drepper@cygnus.com>
 
 	* math/fenv.h: Include bits/fenvinline.h if optimizing.
diff --git a/sysdeps/unix/sysv/linux/setrlimit.c b/sysdeps/unix/sysv/linux/setrlimit.c
index 1316159353..50506c3ad0 100644
--- a/sysdeps/unix/sysv/linux/setrlimit.c
+++ b/sysdeps/unix/sysv/linux/setrlimit.c
@@ -60,10 +60,10 @@ __setrlimit (resource, rlimits)
 #ifndef __ASSUME_NEW_GETRLIMIT_SYSCALL
   /* We might have to correct the limits values.  Since the old values
      were signed the new values are too large.  */
-  rlimits.rlim_cur = MIN ((unsigned long int) rlimits.rlim_cur,
-			  RLIM_INFINITY >> 2);
-  rlimits.rlim_max = MIN ((unsigned long int) rlimits.rlim_max,
-			  RLIM_INFINITY >> 2);
+  rlimits->rlim_cur = MIN ((unsigned long int) rlimits->rlim_cur,
+			   RLIM_INFINITY >> 2);
+  rlimits->rlim_max = MIN ((unsigned long int) rlimits->rlim_max,
+			   RLIM_INFINITY >> 2);
 
   /* Fall back on the old system call.  */
   return INLINE_SYSCALL (setrlimit, 2, resource, rlimits);