Deleted Added
full compact
openpam_restore_cred.c (117610) openpam_restore_cred.c (125647)
1/*-
2 * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by ThinkSec AS and
6 * Network Associates Laboratories, the Security Research Division of
7 * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
8 * ("CBOSS"), as part of the DARPA CHATS research program.

--- 17 unchanged lines hidden (view full) ---

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
1/*-
2 * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by ThinkSec AS and
6 * Network Associates Laboratories, the Security Research Division of
7 * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
8 * ("CBOSS"), as part of the DARPA CHATS research program.

--- 17 unchanged lines hidden (view full) ---

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#9 $
34 * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#10 $
35 */
36
37#include <sys/param.h>
38
39#include <grp.h>
40#include <limits.h>
41#include <pwd.h>
42#include <stdlib.h>

--- 8 unchanged lines hidden (view full) ---

51 *
52 * Restore credentials
53 */
54
55int
56openpam_restore_cred(pam_handle_t *pamh)
57{
58 struct pam_saved_cred *scred;
35 */
36
37#include <sys/param.h>
38
39#include <grp.h>
40#include <limits.h>
41#include <pwd.h>
42#include <stdlib.h>

--- 8 unchanged lines hidden (view full) ---

51 *
52 * Restore credentials
53 */
54
55int
56openpam_restore_cred(pam_handle_t *pamh)
57{
58 struct pam_saved_cred *scred;
59 void *scredp;
59 int r;
60
61 ENTER();
60 int r;
61
62 ENTER();
62 r = pam_get_data(pamh, PAM_SAVED_CRED, (const void **)&scred);
63 r = pam_get_data(pamh, PAM_SAVED_CRED, &scredp);
63 if (r != PAM_SUCCESS)
64 RETURNC(r);
64 if (r != PAM_SUCCESS)
65 RETURNC(r);
65 if (scred == NULL)
66 if (scredp == NULL)
66 RETURNC(PAM_SYSTEM_ERR);
67 RETURNC(PAM_SYSTEM_ERR);
68 scred = scredp;
67 if (scred->euid != geteuid()) {
68 if (seteuid(scred->euid) < 0 ||
69 setgroups(scred->ngroups, scred->groups) < 0 ||
70 setegid(scred->egid) < 0)
71 RETURNC(PAM_SYSTEM_ERR);
72 }
73 pam_set_data(pamh, PAM_SAVED_CRED, NULL, NULL);
74 RETURNC(PAM_SUCCESS);

--- 17 unchanged lines hidden ---
69 if (scred->euid != geteuid()) {
70 if (seteuid(scred->euid) < 0 ||
71 setgroups(scred->ngroups, scred->groups) < 0 ||
72 setegid(scred->egid) < 0)
73 RETURNC(PAM_SYSTEM_ERR);
74 }
75 pam_set_data(pamh, PAM_SAVED_CRED, NULL, NULL);
76 RETURNC(PAM_SUCCESS);

--- 17 unchanged lines hidden ---