Attachment 109 Details for Bug 261 – Merge three previous patches.

[patch] Merge three previous patches.

openssh-aixcred.patch (text/plain), 3.92 KB, created by Darren Tucker on 2002-06-07 17:55:29 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2002-06-07 17:55:29 AEST

Size: 3.92 KB

patch

obsolete

>Index: openbsd-compat/port-aix.c
>===================================================================
>RCS file: /cvs/openssh/openbsd-compat/port-aix.c,v
>retrieving revision 1.2
>diff -u -r1.2 port-aix.c
>--- openbsd-compat/port-aix.c	24 Feb 2002 20:25:47 -0000	1.2
>+++ openbsd-compat/port-aix.c	7 Jun 2002 07:50:54 -0000
>@@ -24,79 +24,16 @@
> /*
>  * AIX-specific login initialisation
>  */
>-void 
>-set_limit(char *user, char *soft, char *hard, int resource, int mult)
>-{
>-        struct rlimit rlim;
>-        int slim, hlim;
>-
>-        getrlimit(resource, &rlim);
>-
>-        slim = 0;
>-        if (getuserattr(user, soft, &slim, SEC_INT) != -1) {
>-                if (slim < 0) {
>-                        rlim.rlim_cur = RLIM_INFINITY;
>-                } else if (slim != 0) {
>-                        /* See the wackiness below */
>-                        if (rlim.rlim_cur == slim * mult)
>-                                slim = 0;
>-                        else
>-                                rlim.rlim_cur = slim * mult;
>-                }
>-        }
>-        hlim = 0;
>-        if (getuserattr(user, hard, &hlim, SEC_INT) != -1) {
>-                if (hlim < 0) {
>-                        rlim.rlim_max = RLIM_INFINITY;
>-                } else if (hlim != 0) {
>-                        rlim.rlim_max = hlim * mult;
>-                }
>-        }
>-
>-        /*
>-         * XXX For cpu and fsize the soft limit is set to the hard limit
>-         * if the hard limit is left at its default value and the soft limit
>-         * is changed from its default value, either by requesting it
>-         * (slim == 0) or by setting it to the current default.  At least
>-         * that's how rlogind does it.  If you're confused you're not alone.
>-         * Bug or feature? AIX 4.3.1.2
>-         */
>-        if ((!strcmp(soft, "fsize") || !strcmp(soft, "cpu"))
>-            && hlim == 0 && slim != 0)
>-                rlim.rlim_max = rlim.rlim_cur;
>-        /* A specified hard limit limits the soft limit */
>-        else if (hlim > 0 && rlim.rlim_cur > rlim.rlim_max)
>-                rlim.rlim_cur = rlim.rlim_max;
>-        /* A soft limit can increase a hard limit */
>-        else if (rlim.rlim_cur > rlim.rlim_max)
>-                rlim.rlim_max = rlim.rlim_cur;
>-
>-        if (setrlimit(resource, &rlim) != 0)
>-                error("setrlimit(%.10s) failed: %.100s", soft, strerror(errno));
>-}
> 
> void 
> set_limits_from_userattr(char *user)
> {
>-        int mask;
>-        char buf[16];
>-
>-        set_limit(user, S_UFSIZE, S_UFSIZE_HARD, RLIMIT_FSIZE, 512);
>-        set_limit(user, S_UCPU, S_UCPU_HARD, RLIMIT_CPU, 1);
>-        set_limit(user, S_UDATA, S_UDATA_HARD, RLIMIT_DATA, 512);
>-        set_limit(user, S_USTACK, S_USTACK_HARD, RLIMIT_STACK, 512);
>-        set_limit(user, S_URSS, S_URSS_HARD, RLIMIT_RSS, 512);
>-        set_limit(user, S_UCORE, S_UCORE_HARD, RLIMIT_CORE, 512);
>-#if defined(S_UNOFILE)
>-        set_limit(user, S_UNOFILE, S_UNOFILE_HARD, RLIMIT_NOFILE, 1);
>-#endif
>-
>-        if (getuserattr(user, S_UMASK, &mask, SEC_INT) != -1) {
>-                /* Convert decimal to octal */
>-                (void) snprintf(buf, sizeof(buf), "%d", mask);
>-                if (sscanf(buf, "%o", &mask) == 1)
>-                        umask(mask);
>-        }
>+	/* 
>+	   Set up the process credentials and process environment
>+	   based on the AIX userdatabase. 
>+	*/
>+	setpcred (user, NULL);
>+	setpenv (user, PENV_INIT, NULL, NULL); 
> }
> #endif /* defined(HAVE_GETUSERATTR) */
> 
>Index: openbsd-compat/port-aix.h
>===================================================================
>RCS file: /cvs/openssh/openbsd-compat/port-aix.h,v
>retrieving revision 1.3
>diff -u -r1.3 port-aix.h
>--- openbsd-compat/port-aix.h	25 Feb 2002 15:48:04 -0000	1.3
>+++ openbsd-compat/port-aix.h	7 Jun 2002 07:50:54 -0000
>@@ -1,7 +1,6 @@
> #ifdef _AIX
> 
> #ifdef HAVE_GETUSERATTR
>-void set_limit(char *user, char *soft, char *hard, int resource, int mult);
> void set_limits_from_userattr(char *user);
> #endif /* HAVE_GETUSERATTR */
>

Actions: View | Diff

Attachments on bug 261: 107 | 109 | 110 | 114