Deleted Added
sdiff udiff text old ( 186063 ) new ( 228690 )
full compact
pam_set_item.c (186063) pam_set_item.c (228690)
1/*-
2 * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
1/*-
2 * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
3 * Copyright (c) 2004-2007 Dag-Erling Sm��rgrav
3 * Copyright (c) 2004-2011 Dag-Erling Sm��rgrav
4 * All rights reserved.
5 *
6 * This software was developed for the FreeBSD Project by ThinkSec AS and
7 * Network Associates Laboratories, the Security Research Division of
8 * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
9 * ("CBOSS"), as part of the DARPA CHATS research program.
10 *
11 * Redistribution and use in source and binary forms, with or without

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

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

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

27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * $Id: pam_set_item.c 408 2007-12-21 11:36:24Z des $
35 * $Id: pam_set_item.c 496 2011-11-21 16:20:45Z des $
36 */
37
36 */
37
38#ifdef HAVE_CONFIG_H
39# include "config.h"
40#endif
41
38#include <sys/param.h>
39
40#include <stdlib.h>
41#include <string.h>
42
43#include <security/pam_appl.h>
44
45#include "openpam_impl.h"

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

61
62 ENTERI(item_type);
63 if (pamh == NULL)
64 RETURNC(PAM_SYSTEM_ERR);
65 slot = &pamh->item[item_type];
66 osize = nsize = 0;
67 switch (item_type) {
68 case PAM_SERVICE:
42#include <sys/param.h>
43
44#include <stdlib.h>
45#include <string.h>
46
47#include <security/pam_appl.h>
48
49#include "openpam_impl.h"

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

65
66 ENTERI(item_type);
67 if (pamh == NULL)
68 RETURNC(PAM_SYSTEM_ERR);
69 slot = &pamh->item[item_type];
70 osize = nsize = 0;
71 switch (item_type) {
72 case PAM_SERVICE:
73 /* set once only, by pam_start() */
74 if (*slot != NULL)
75 RETURNC(PAM_SYSTEM_ERR);
76 /* fall through */
69 case PAM_USER:
70 case PAM_AUTHTOK:
71 case PAM_OLDAUTHTOK:
72 case PAM_TTY:
73 case PAM_RHOST:
74 case PAM_RUSER:
75 case PAM_USER_PROMPT:
76 case PAM_AUTHTOK_PROMPT:
77 case PAM_OLDAUTHTOK_PROMPT:
77 case PAM_USER:
78 case PAM_AUTHTOK:
79 case PAM_OLDAUTHTOK:
80 case PAM_TTY:
81 case PAM_RHOST:
82 case PAM_RUSER:
83 case PAM_USER_PROMPT:
84 case PAM_AUTHTOK_PROMPT:
85 case PAM_OLDAUTHTOK_PROMPT:
86 case PAM_HOST:
78 if (*slot != NULL)
79 osize = strlen(*slot) + 1;
80 if (item != NULL)
81 nsize = strlen(item) + 1;
82 break;
83 case PAM_REPOSITORY:
84 osize = nsize = sizeof(struct pam_repository);
85 break;

--- 35 unchanged lines hidden --- 		87 if (*slot != NULL)
88 osize = strlen(*slot) + 1;
89 if (item != NULL)
90 nsize = strlen(item) + 1;
91 break;
92 case PAM_REPOSITORY:
93 osize = nsize = sizeof(struct pam_repository);
94 break;

--- 35 unchanged lines hidden ---