mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
Some coding convention pedantism.
Guenther
(This used to be commit 338baf96cb
)
This commit is contained in:
parent
0240d175bf
commit
2c072ac879
@ -31,7 +31,7 @@
|
||||
* @return #wbcErr
|
||||
**/
|
||||
|
||||
wbcErr wbcAuthenticateUser(const char *username,
|
||||
wbcErr wbcAuthenticateUser(const char *username,
|
||||
const char *password)
|
||||
{
|
||||
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
|
||||
@ -61,5 +61,5 @@ wbcErr wbcAuthenticateUser(const char *username,
|
||||
BAIL_ON_WBC_ERROR(wbc_status);
|
||||
|
||||
done:
|
||||
return wbc_status;
|
||||
return wbc_status;
|
||||
}
|
||||
|
@ -228,14 +228,14 @@ wbcErr wbcGetgrnam(const char *name, struct group **grp)
|
||||
&response);
|
||||
BAIL_ON_WBC_ERROR(wbc_status);
|
||||
|
||||
*grp = copy_group_entry(&response.data.gr,
|
||||
*grp = copy_group_entry(&response.data.gr,
|
||||
(char*)response.extra_data.data);
|
||||
BAIL_ON_PTR_ERROR(*grp, wbc_status);
|
||||
|
||||
done:
|
||||
if (response.extra_data.data)
|
||||
free(response.extra_data.data);
|
||||
|
||||
|
||||
return wbc_status;
|
||||
}
|
||||
|
||||
@ -271,7 +271,7 @@ wbcErr wbcGetgrgid(gid_t gid, struct group **grp)
|
||||
&response);
|
||||
BAIL_ON_WBC_ERROR(wbc_status);
|
||||
|
||||
*grp = copy_group_entry(&response.data.gr,
|
||||
*grp = copy_group_entry(&response.data.gr,
|
||||
(char*)response.extra_data.data);
|
||||
BAIL_ON_PTR_ERROR(*grp, wbc_status);
|
||||
|
||||
|
@ -392,7 +392,7 @@ wbcErr wbcLookupRids(struct wbcDomainSid *dom_sid,
|
||||
*q = '\0';
|
||||
|
||||
(*names)[i] = talloc_strdup((*names), p);
|
||||
BAIL_ON_PTR_ERROR(((*names)[i]), wbc_status);
|
||||
BAIL_ON_PTR_ERROR(((*names)[i]), wbc_status);
|
||||
|
||||
p = q+1;
|
||||
}
|
||||
@ -405,10 +405,10 @@ wbcErr wbcLookupRids(struct wbcDomainSid *dom_sid,
|
||||
wbc_status = WBC_ERR_SUCCESS;
|
||||
|
||||
done:
|
||||
if (response.extra_data.data) {
|
||||
if (response.extra_data.data) {
|
||||
free(response.extra_data.data);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (!WBC_ERROR_IS_OK(wbc_status)) {
|
||||
if (domain_name)
|
||||
talloc_free(domain_name);
|
||||
@ -421,4 +421,4 @@ wbcErr wbcLookupRids(struct wbcDomainSid *dom_sid,
|
||||
}
|
||||
|
||||
return wbc_status;
|
||||
}
|
||||
}
|
||||
|
@ -60,7 +60,7 @@ wbcErr wbcDomainInfo(const char *domain, struct wbcDomainInfo **dinfo)
|
||||
struct winbindd_response response;
|
||||
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
|
||||
struct wbcDomainInfo *info = NULL;
|
||||
|
||||
|
||||
if (!domain || !dinfo) {
|
||||
wbc_status = WBC_ERR_INVALID_PARAM;
|
||||
BAIL_ON_WBC_ERROR(wbc_status);
|
||||
@ -71,7 +71,7 @@ wbcErr wbcDomainInfo(const char *domain, struct wbcDomainInfo **dinfo)
|
||||
ZERO_STRUCT(request);
|
||||
ZERO_STRUCT(response);
|
||||
|
||||
strncpy(request.domain_name, domain,
|
||||
strncpy(request.domain_name, domain,
|
||||
sizeof(request.domain_name)-1);
|
||||
|
||||
wbc_status = wbcRequestResponse(WINBINDD_DOMAIN_INFO,
|
||||
@ -82,15 +82,15 @@ wbcErr wbcDomainInfo(const char *domain, struct wbcDomainInfo **dinfo)
|
||||
info = talloc(NULL, struct wbcDomainInfo);
|
||||
BAIL_ON_PTR_ERROR(info, wbc_status);
|
||||
|
||||
info->short_name = talloc_strdup(info,
|
||||
info->short_name = talloc_strdup(info,
|
||||
response.data.domain_info.name);
|
||||
BAIL_ON_PTR_ERROR(info->short_name, wbc_status);
|
||||
|
||||
info->dns_name = talloc_strdup(info,
|
||||
info->dns_name = talloc_strdup(info,
|
||||
response.data.domain_info.alt_name);
|
||||
BAIL_ON_PTR_ERROR(info->dns_name, wbc_status);
|
||||
|
||||
wbc_status = wbcStringToSid(response.data.domain_info.sid,
|
||||
wbc_status = wbcStringToSid(response.data.domain_info.sid,
|
||||
&info->sid);
|
||||
BAIL_ON_WBC_ERROR(wbc_status);
|
||||
|
||||
@ -102,7 +102,7 @@ wbcErr wbcDomainInfo(const char *domain, struct wbcDomainInfo **dinfo)
|
||||
info->flags |= WBC_DOMINFO_PRIMARY;
|
||||
|
||||
*dinfo = info;
|
||||
|
||||
|
||||
wbc_status = WBC_ERR_SUCCESS;
|
||||
|
||||
done:
|
||||
|
@ -177,7 +177,7 @@ wbcErr wbcDomainSequenceNumbers(void);
|
||||
* Athenticate functions
|
||||
*/
|
||||
|
||||
wbcErr wbcAuthenticateUser(const char *username,
|
||||
wbcErr wbcAuthenticateUser(const char *username,
|
||||
const char *password);
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user