diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
| commit | 04b244dd661c24b510ac22936decfc0972d202d3 (patch) | |
| tree | 3ebfef98afc303fddf3415d6fba64e8682f495e8 /usr/src/cmd/nscd/nscd_frontend.c | |
| parent | eac250589e41f1b705e1b7427b02b3379aac9f9e (diff) | |
| parent | a69187741b83640a90dd8586195456dd50c016a8 (diff) | |
| download | illumos-joyent-20120517.tar.gz | |
Merge git.joyent.com:illumos-joyent20120517
Diffstat (limited to 'usr/src/cmd/nscd/nscd_frontend.c')
| -rw-r--r-- | usr/src/cmd/nscd/nscd_frontend.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr/src/cmd/nscd/nscd_frontend.c b/usr/src/cmd/nscd/nscd_frontend.c index 70efcb8258..7ed5e71bca 100644 --- a/usr/src/cmd/nscd/nscd_frontend.c +++ b/usr/src/cmd/nscd/nscd_frontend.c @@ -21,6 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2012 Milan Jurik. All rights reserved. */ #include <stdlib.h> @@ -389,7 +390,8 @@ N2N_check_priv( _NSCD_LOG(NSCD_LOG_FRONT_END, NSCD_LOG_LEVEL_DEBUG) (me, "door_ucred: %s\n", strerror(errno)); - NSCD_RETURN_STATUS(phdr, NSS_ERROR, errnum); + NSCD_SET_STATUS(phdr, NSS_ERROR, errnum); + return; } eset = ucred_getprivset(uc, PRIV_EFFECTIVE); @@ -405,7 +407,8 @@ N2N_check_priv( ucred_getruid(uc), ucred_geteuid(uc), zoneid); ucred_free(uc); - NSCD_RETURN_STATUS(phdr, NSS_ERROR, EACCES); + NSCD_SET_STATUS(phdr, NSS_ERROR, EACCES); + return; } _NSCD_LOG(NSCD_LOG_FRONT_END, NSCD_LOG_LEVEL_DEBUG) @@ -415,7 +418,7 @@ N2N_check_priv( ucred_free(uc); - NSCD_RETURN_STATUS_SUCCESS(phdr); + NSCD_SET_STATUS_SUCCESS(phdr); } void @@ -439,7 +442,8 @@ _nscd_APP_check_cred( _NSCD_LOG(log_comp, NSCD_LOG_LEVEL_ERROR) (me, "door_ucred: %s\n", strerror(errno)); - NSCD_RETURN_STATUS(phdr, NSS_ERROR, errnum); + NSCD_SET_STATUS(phdr, NSS_ERROR, errnum); + return; } NSCD_SET_STATUS_SUCCESS(phdr); |