mirror of
https://github.com/samba-team/samba.git
synced 2025-01-13 13:18:06 +03:00
removed lp_domain_workstation() parameter
(This used to be commit 80d6a3bb0cf3853aa51594cce888e6c0a6e6f634)
This commit is contained in:
parent
9118b8508b
commit
d48e8376f1
@ -862,11 +862,6 @@ void wks_io_r_query_info(char *desc, WKS_R_QUERY_INFO *r_u, prs_struct *ps, int
|
|||||||
|
|
||||||
/*The following definitions come from lib/rpc/server/srv_ldap_helpers.c */
|
/*The following definitions come from lib/rpc/server/srv_ldap_helpers.c */
|
||||||
|
|
||||||
BOOL get_ldap_entries(SAM_USER_INFO_21 *pw_buf,
|
|
||||||
int *total_entries, int *num_entries,
|
|
||||||
int max_num_entries,
|
|
||||||
uint16 acb_mask, int switch_level);
|
|
||||||
BOOL ldap_get_user_info_21(SAM_USER_INFO_21 *id21, uint32 rid);
|
|
||||||
void ldap_helper_dummy(void);
|
void ldap_helper_dummy(void);
|
||||||
|
|
||||||
/*The following definitions come from lib/rpc/server/srv_lsa.c */
|
/*The following definitions come from lib/rpc/server/srv_lsa.c */
|
||||||
@ -974,7 +969,6 @@ char *lp_driverfile(void);
|
|||||||
char *lp_domain_sid(void);
|
char *lp_domain_sid(void);
|
||||||
char *lp_domain_other_sids(void);
|
char *lp_domain_other_sids(void);
|
||||||
char *lp_domain_groups(void);
|
char *lp_domain_groups(void);
|
||||||
char *lp_domain_workstations(void);
|
|
||||||
char *lp_domain_admin_users(void);
|
char *lp_domain_admin_users(void);
|
||||||
char *lp_domain_guest_users(void);
|
char *lp_domain_guest_users(void);
|
||||||
char *lp_domain_hostsallow(void);
|
char *lp_domain_hostsallow(void);
|
||||||
|
@ -123,7 +123,6 @@ typedef struct
|
|||||||
char *szDomainGuestUsers;
|
char *szDomainGuestUsers;
|
||||||
char *szDomainHostsallow;
|
char *szDomainHostsallow;
|
||||||
char *szDomainHostsdeny;
|
char *szDomainHostsdeny;
|
||||||
char *szDomainWorkstations;
|
|
||||||
char *szUsernameMap;
|
char *szUsernameMap;
|
||||||
char *szCharacterSet;
|
char *szCharacterSet;
|
||||||
char *szLogonScript;
|
char *szLogonScript;
|
||||||
@ -586,7 +585,6 @@ static struct parm_struct parm_table[] =
|
|||||||
{"domain other sids",P_STRING, P_GLOBAL, &Globals.szDomainOtherSIDs, NULL, NULL, 0},
|
{"domain other sids",P_STRING, P_GLOBAL, &Globals.szDomainOtherSIDs, NULL, NULL, 0},
|
||||||
{"domain groups", P_STRING, P_GLOBAL, &Globals.szDomainGroups, NULL, NULL, 0},
|
{"domain groups", P_STRING, P_GLOBAL, &Globals.szDomainGroups, NULL, NULL, 0},
|
||||||
{"domain controller",P_BOOL , P_GLOBAL, &Globals.bDomainController,NULL, NULL, 0},
|
{"domain controller",P_BOOL , P_GLOBAL, &Globals.bDomainController,NULL, NULL, 0},
|
||||||
{"domain workstations", P_STRING, P_GLOBAL, &Globals.szDomainWorkstations, NULL, NULL, 0},
|
|
||||||
{"domain admin users",P_STRING, P_GLOBAL, &Globals.szDomainAdminUsers, NULL, NULL, 0},
|
{"domain admin users",P_STRING, P_GLOBAL, &Globals.szDomainAdminUsers, NULL, NULL, 0},
|
||||||
{"domain guest users",P_STRING, P_GLOBAL, &Globals.szDomainGuestUsers, NULL, NULL, 0},
|
{"domain guest users",P_STRING, P_GLOBAL, &Globals.szDomainGuestUsers, NULL, NULL, 0},
|
||||||
{"domain hosts allow",P_STRING, P_GLOBAL, &Globals.szDomainHostsallow, NULL, NULL, 0},
|
{"domain hosts allow",P_STRING, P_GLOBAL, &Globals.szDomainHostsallow, NULL, NULL, 0},
|
||||||
@ -985,7 +983,6 @@ FN_GLOBAL_STRING(lp_driverfile,&Globals.szDriverFile)
|
|||||||
FN_GLOBAL_STRING(lp_domain_sid,&Globals.szDomainSID)
|
FN_GLOBAL_STRING(lp_domain_sid,&Globals.szDomainSID)
|
||||||
FN_GLOBAL_STRING(lp_domain_other_sids,&Globals.szDomainOtherSIDs)
|
FN_GLOBAL_STRING(lp_domain_other_sids,&Globals.szDomainOtherSIDs)
|
||||||
FN_GLOBAL_STRING(lp_domain_groups,&Globals.szDomainGroups)
|
FN_GLOBAL_STRING(lp_domain_groups,&Globals.szDomainGroups)
|
||||||
FN_GLOBAL_STRING(lp_domain_workstations,&Globals.szDomainWorkstations)
|
|
||||||
FN_GLOBAL_STRING(lp_domain_admin_users,&Globals.szDomainAdminUsers)
|
FN_GLOBAL_STRING(lp_domain_admin_users,&Globals.szDomainAdminUsers)
|
||||||
FN_GLOBAL_STRING(lp_domain_guest_users,&Globals.szDomainGuestUsers)
|
FN_GLOBAL_STRING(lp_domain_guest_users,&Globals.szDomainGuestUsers)
|
||||||
FN_GLOBAL_STRING(lp_domain_hostsallow,&Globals.szDomainHostsallow)
|
FN_GLOBAL_STRING(lp_domain_hostsallow,&Globals.szDomainHostsallow)
|
||||||
|
@ -216,7 +216,7 @@ struct sam_passwd *getsmb21pwent(void *vp)
|
|||||||
pstrcpy(home_drive , lp_logon_drive ());
|
pstrcpy(home_drive , lp_logon_drive ());
|
||||||
pstrcpy(home_dir , lp_logon_home ());
|
pstrcpy(home_dir , lp_logon_home ());
|
||||||
pstrcpy(acct_desc , "");
|
pstrcpy(acct_desc , "");
|
||||||
pstrcpy(workstations , lp_domain_workstations());
|
pstrcpy(workstations , "");
|
||||||
|
|
||||||
sam_logon_in_ssb = False;
|
sam_logon_in_ssb = False;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user