mirror of
https://github.com/samba-team/samba.git
synced 2025-08-26 01:49:31 +03:00
Add some const to winbind_userinfo
This commit is contained in:
@ -65,7 +65,8 @@ struct nss_info_methods {
|
||||
const DOM_SID *sid,
|
||||
TALLOC_CTX *ctx,
|
||||
ADS_STRUCT *ads, LDAPMessage *msg,
|
||||
char **homedir, char **shell, char **gecos, gid_t *p_gid);
|
||||
const char **homedir, const char **shell,
|
||||
const char **gecos, gid_t *p_gid);
|
||||
NTSTATUS (*map_to_alias)(TALLOC_CTX *mem_ctx,
|
||||
struct nss_domain_entry *e,
|
||||
const char *name, char **alias);
|
||||
@ -85,10 +86,10 @@ NTSTATUS smb_register_idmap_nss(int version,
|
||||
NTSTATUS nss_init( const char **nss_list );
|
||||
|
||||
NTSTATUS nss_get_info( const char *domain, const DOM_SID *user_sid,
|
||||
TALLOC_CTX *ctx,
|
||||
TALLOC_CTX *ctx,
|
||||
ADS_STRUCT *ads, LDAPMessage *msg,
|
||||
char **homedir, char **shell, char **gecos,
|
||||
gid_t *p_gid);
|
||||
const char **homedir, const char **shell,
|
||||
const char **gecos, gid_t *p_gid);
|
||||
|
||||
NTSTATUS nss_map_to_alias( TALLOC_CTX *mem_ctx, const char *domain,
|
||||
const char *name, char **alias );
|
||||
|
@ -822,9 +822,9 @@ static NTSTATUS nss_ad_get_info( struct nss_domain_entry *e,
|
||||
TALLOC_CTX *mem_ctx,
|
||||
ADS_STRUCT *ads,
|
||||
LDAPMessage *msg,
|
||||
char **homedir,
|
||||
char **shell,
|
||||
char **gecos,
|
||||
const char **homedir,
|
||||
const char **shell,
|
||||
const char **gecos,
|
||||
uint32 *gid )
|
||||
{
|
||||
const char *attrs[] = {NULL, /* attr_homedir */
|
||||
|
@ -318,8 +318,9 @@ static NTSTATUS _nss_adex_get_info(struct
|
||||
TALLOC_CTX * ctx,
|
||||
ADS_STRUCT * ads,
|
||||
LDAPMessage * msg,
|
||||
char **homedir,
|
||||
char **shell, char **gecos, gid_t * p_gid)
|
||||
const char **homedir,
|
||||
const char **shell,
|
||||
const char **gecos, gid_t * p_gid)
|
||||
{
|
||||
NTSTATUS nt_status;
|
||||
struct likewise_cell *cell;
|
||||
|
@ -97,8 +97,9 @@ struct cell_provider_api {
|
||||
enum id_type * type, const DOM_SID * sid);
|
||||
NTSTATUS(*get_nss_info) (const DOM_SID * sid,
|
||||
TALLOC_CTX * ctx,
|
||||
char **homedir,
|
||||
char **shell, char **gecos, gid_t * p_gid);
|
||||
const char **homedir,
|
||||
const char **shell,
|
||||
const char **gecos, gid_t * p_gid);
|
||||
NTSTATUS(*map_to_alias) (TALLOC_CTX * mem_ctx,
|
||||
const char *domain,
|
||||
const char *name, char **alias);
|
||||
|
@ -895,21 +895,25 @@ done:
|
||||
static NTSTATUS pull_nss_info(struct likewise_cell *c,
|
||||
LDAPMessage *msg,
|
||||
TALLOC_CTX *ctx,
|
||||
char **homedir,
|
||||
char **shell,
|
||||
char **gecos,
|
||||
const char **homedir,
|
||||
const char **shell,
|
||||
const char **gecos,
|
||||
gid_t *p_gid)
|
||||
{
|
||||
NTSTATUS nt_status;
|
||||
char *tmp;
|
||||
|
||||
nt_status = get_object_string(c, msg, ctx, ADEX_ATTR_HOMEDIR, homedir);
|
||||
nt_status = get_object_string(c, msg, ctx, ADEX_ATTR_HOMEDIR, &tmp);
|
||||
BAIL_ON_NTSTATUS_ERROR(nt_status);
|
||||
*homedir = tmp;
|
||||
|
||||
nt_status = get_object_string(c, msg, ctx, ADEX_ATTR_SHELL, shell);
|
||||
nt_status = get_object_string(c, msg, ctx, ADEX_ATTR_SHELL, &tmp);
|
||||
BAIL_ON_NTSTATUS_ERROR(nt_status);
|
||||
*shell = tmp;
|
||||
|
||||
nt_status = get_object_string(c, msg, ctx, ADEX_ATTR_GECOS, gecos);
|
||||
nt_status = get_object_string(c, msg, ctx, ADEX_ATTR_GECOS, &tmp);
|
||||
/* Gecos is often not set so ignore failures */
|
||||
*gecos = tmp;
|
||||
|
||||
nt_status = get_object_uint32(c, msg, ADEX_ATTR_GIDNUM, p_gid);
|
||||
BAIL_ON_NTSTATUS_ERROR(nt_status);
|
||||
@ -1021,9 +1025,9 @@ done:
|
||||
|
||||
static NTSTATUS _ccp_nss_get_info(const DOM_SID * sid,
|
||||
TALLOC_CTX * ctx,
|
||||
char **homedir,
|
||||
char **shell,
|
||||
char **gecos, gid_t * p_gid)
|
||||
const char **homedir,
|
||||
const char **shell,
|
||||
const char **gecos, gid_t * p_gid)
|
||||
{
|
||||
struct likewise_cell *cell = NULL;
|
||||
LDAPMessage *msg = NULL;
|
||||
|
@ -276,9 +276,9 @@ static NTSTATUS nss_hash_get_info(struct nss_domain_entry *e,
|
||||
TALLOC_CTX *ctx,
|
||||
ADS_STRUCT *ads,
|
||||
LDAPMessage *msg,
|
||||
char **homedir,
|
||||
char **shell,
|
||||
char **gecos,
|
||||
const char **homedir,
|
||||
const char **shell,
|
||||
const char **gecos,
|
||||
gid_t *p_gid )
|
||||
{
|
||||
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
|
||||
|
@ -299,11 +299,11 @@ static struct nss_domain_entry *find_nss_domain( const char *domain )
|
||||
/********************************************************************
|
||||
*******************************************************************/
|
||||
|
||||
NTSTATUS nss_get_info( const char *domain, const DOM_SID *user_sid,
|
||||
NTSTATUS nss_get_info( const char *domain, const DOM_SID *user_sid,
|
||||
TALLOC_CTX *ctx,
|
||||
ADS_STRUCT *ads, LDAPMessage *msg,
|
||||
char **homedir, char **shell, char **gecos,
|
||||
gid_t *p_gid)
|
||||
const char **homedir, const char **shell,
|
||||
const char **gecos, gid_t *p_gid)
|
||||
{
|
||||
struct nss_domain_entry *p;
|
||||
struct nss_info_methods *m;
|
||||
|
@ -37,9 +37,9 @@ static NTSTATUS nss_template_get_info( struct nss_domain_entry *e,
|
||||
TALLOC_CTX *ctx,
|
||||
ADS_STRUCT *ads,
|
||||
LDAPMessage *msg,
|
||||
char **homedir,
|
||||
char **shell,
|
||||
char **gecos,
|
||||
const char **homedir,
|
||||
const char **shell,
|
||||
const char **gecos,
|
||||
gid_t *gid )
|
||||
{
|
||||
if ( !homedir || !shell || !gecos )
|
||||
|
@ -91,11 +91,11 @@ struct getpwent_user {
|
||||
|
||||
/* Server state structure */
|
||||
|
||||
typedef struct {
|
||||
char *acct_name;
|
||||
char *full_name;
|
||||
char *homedir;
|
||||
char *shell;
|
||||
typedef struct winbind_userinfo {
|
||||
const char *acct_name;
|
||||
const char *full_name;
|
||||
const char *homedir;
|
||||
const char *shell;
|
||||
gid_t primary_gid; /* allow the nss_info
|
||||
backend to set the primary group */
|
||||
DOM_SID user_sid; /* NT user and primary group SIDs */
|
||||
|
@ -201,9 +201,10 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
|
||||
i = 0;
|
||||
|
||||
for (msg = ads_first_entry(ads, res); msg; msg = ads_next_entry(ads, msg)) {
|
||||
char *name, *gecos = NULL;
|
||||
char *homedir = NULL;
|
||||
char *shell = NULL;
|
||||
const char *name;
|
||||
const char *gecos = NULL;
|
||||
const char *homedir = NULL;
|
||||
const char *shell = NULL;
|
||||
uint32 group;
|
||||
uint32 atype;
|
||||
DOM_SID user_sid;
|
||||
|
@ -4090,8 +4090,8 @@ NTSTATUS nss_get_info_cached( struct winbindd_domain *domain,
|
||||
const DOM_SID *user_sid,
|
||||
TALLOC_CTX *ctx,
|
||||
ADS_STRUCT *ads, LDAPMessage *msg,
|
||||
char **homedir, char **shell, char **gecos,
|
||||
gid_t *p_gid)
|
||||
const char **homedir, const char **shell,
|
||||
const char **gecos, gid_t *p_gid)
|
||||
{
|
||||
struct winbind_cache *cache = get_cache(domain);
|
||||
struct cache_entry *centry = NULL;
|
||||
|
@ -177,8 +177,8 @@ NTSTATUS nss_get_info_cached( struct winbindd_domain *domain,
|
||||
const DOM_SID *user_sid,
|
||||
TALLOC_CTX *ctx,
|
||||
ADS_STRUCT *ads, LDAPMessage *msg,
|
||||
char **homedir, char **shell, char **gecos,
|
||||
gid_t *p_gid);
|
||||
const char **homedir, const char **shell,
|
||||
const char **gecos, gid_t *p_gid);
|
||||
|
||||
/* The following definitions come from winbindd/winbindd_ccache_access.c */
|
||||
|
||||
|
Reference in New Issue
Block a user