Deleted Added
full compact
ypldap.h (290936) ypldap.h (297907)
1/* $OpenBSD: ypldap.h,v 1.16 2015/01/16 06:40:22 deraadt Exp $ */
1/* $OpenBSD: ypldap.h,v 1.16 2015/01/16 06:40:22 deraadt Exp $ */
2/* $FreeBSD: head/usr.sbin/ypldap/ypldap.h 290936 2015-11-16 17:03:52Z rodrigc $ */
2/* $FreeBSD: head/usr.sbin/ypldap/ypldap.h 297907 2016-04-13 03:36:34Z araujo $ */
3
4/*
5 * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.
10 *

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

37 IMSG_END_UPDATE,
38 IMSG_TRASH_UPDATE,
39 IMSG_PW_ENTRY,
40 IMSG_GRP_ENTRY,
41 IMSG_HOST_DNS
42};
43
44struct ypldap_addr {
3
4/*
5 * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
6 *
7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies.
10 *

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

37 IMSG_END_UPDATE,
38 IMSG_TRASH_UPDATE,
39 IMSG_PW_ENTRY,
40 IMSG_GRP_ENTRY,
41 IMSG_HOST_DNS
42};
43
44struct ypldap_addr {
45 struct ypldap_addr *next;
46 struct sockaddr_storage ss;
45 TAILQ_ENTRY(ypldap_addr) next;
46 struct sockaddr_storage ss;
47};
47};
48TAILQ_HEAD(ypldap_addr_list, ypldap_addr);
48
49enum {
50 PROC_MAIN,
51 PROC_CLIENT
52} ypldap_process;
53
54struct userent {
55 RB_ENTRY(userent) ue_name_node;

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

86#define F_SSL 0x00100000
87#define F_CONFIGURING 0x00200000
88#define F_NEEDAUTH 0x00400000
89#define F_FIXED_ATTR(n) (1<<n)
90#define F_LIST(n) (1<<n)
91 enum client_state idm_state;
92 u_int32_t idm_flags; /* lower 20 reserved */
93 u_int32_t idm_list;
49
50enum {
51 PROC_MAIN,
52 PROC_CLIENT
53} ypldap_process;
54
55struct userent {
56 RB_ENTRY(userent) ue_name_node;

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

87#define F_SSL 0x00100000
88#define F_CONFIGURING 0x00200000
89#define F_NEEDAUTH 0x00400000
90#define F_FIXED_ATTR(n) (1<<n)
91#define F_LIST(n) (1<<n)
92 enum client_state idm_state;
93 u_int32_t idm_flags; /* lower 20 reserved */
94 u_int32_t idm_list;
94 struct ypldap_addr *idm_addr;
95 struct ypldap_addr_list idm_addr;
95 in_port_t idm_port;
96 char idm_binddn[LINE_WIDTH];
97 char idm_bindcred[LINE_WIDTH];
98 char idm_basedn[LINE_WIDTH];
99 char idm_groupdn[LINE_WIDTH];
100#define FILTER_USER 1
101#define FILTER_GROUP 0
102 char idm_filters[2][FILTER_WIDTH];

--- 120 unchanged lines hidden ---
96 in_port_t idm_port;
97 char idm_binddn[LINE_WIDTH];
98 char idm_bindcred[LINE_WIDTH];
99 char idm_basedn[LINE_WIDTH];
100 char idm_groupdn[LINE_WIDTH];
101#define FILTER_USER 1
102#define FILTER_GROUP 0
103 char idm_filters[2][FILTER_WIDTH];

--- 120 unchanged lines hidden ---