← Back to branch summary

~ubuntu-branches/ubuntu/lucid/samba/lucid-proposed

« back to all changes in this revision

Viewing changes to source/nsswitch/winbind_nss_linux.c

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad
  • Date: 2005-07-21 17:53:23 UTC
  • mfrom: (0.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050721175323-m3oh6aoigywohfnq
Tags: 3.0.14a-6ubuntu1
Resynchronise with Debian, resolving merge conflicts (#12360)

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/nsswitch/winbind_nss_linux.c
62
62
   lib/util_str.c as I really don't want to have to link in any other
63
63
   objects if I can possibly avoid it. */
64
64
 
65
 
BOOL next_token(char **ptr,char *buff,char *sep, size_t bufsize)
 
65
BOOL next_token(char **ptr,char *buff,const char *sep, size_t bufsize)
66
66
{
67
67
        char *s;
68
68
        BOOL quoted;
976
976
        fprintf(stderr, "[%5d]: sidtoname %s\n", getpid(), sid);
977
977
#endif
978
978
 
 
979
        ZERO_STRUCT(response);
 
980
        ZERO_STRUCT(request);
 
981
 
979
982
        /* we need to fetch the separator first time through */
980
983
        if (!sep_char) {
981
 
                ZERO_STRUCT(response);
982
 
                ZERO_STRUCT(request);
983
 
 
984
984
                ret = winbindd_request(WINBINDD_INFO, &request, &response);
985
985
                if (ret != NSS_STATUS_SUCCESS) {
986
986
                        *errnop = errno = EINVAL;