Clean-up various trailing space and >80 column lines.

diff --git a/source3/nsswitch/libwbclient/wbclient.c b/source3/nsswitch/libwbclient/wbclient.c
index bdde562a93f70402e5520d53dcb2860bc798e834..c0b7e0675aa4b824255bee89bcbb7611f24f10e2 100644 (file)
--- a/source3/nsswitch/libwbclient/wbclient.c
+++ b/source3/nsswitch/libwbclient/wbclient.c
@@ -59,7 +59,7 @@ wbcErr wbcRequestResponse(int cmd,
        wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
        NSS_STATUS nss_status;
 
-       /* for some calls the request and/or response cna be NULL */
+       /* for some calls the request and/or response can be NULL */
 
        nss_status = winbindd_request_response(cmd, request, response);
 

diff --git a/source3/nsswitch/libwbclient/wbclient.h b/source3/nsswitch/libwbclient/wbclient.h
index 9c3d1998e0df88d6e6d0a0530a9706e311b8c3c3..639f7f359fe91083ef24cdfd0a525a6d31f3235f 100644 (file)
--- a/source3/nsswitch/libwbclient/wbclient.h
+++ b/source3/nsswitch/libwbclient/wbclient.h
@@ -361,7 +361,7 @@ struct wbcLogonUserInfo {
 #define WBC_AUTH_USER_INFO_NOENCRYPTION                        0x00000002
 #define WBC_AUTH_USER_INFO_CACHED_ACCOUNT              0x00000004
 #define WBC_AUTH_USER_INFO_USED_LM_PASSWORD            0x00000008
-#define WBC_AUTH_USER_INFO_EXTRA_SIDS                  0x00000020
+#define WBC_AUTH_USER_INFO_EXTRA_SIDS                  0x00000020
 #define WBC_AUTH_USER_INFO_SUBAUTH_SESSION_KEY         0x00000040
 #define WBC_AUTH_USER_INFO_SERVER_TRUST_ACCOUNT                0x00000080
 #define WBC_AUTH_USER_INFO_NTLMV2_ENABLED              0x00000100
@@ -388,7 +388,7 @@ struct wbcLogonUserInfo {
 #define WBC_ACB_NOT_DELEGATED                  0x00004000 /* 1 Not delegated */
 #define WBC_ACB_USE_DES_KEY_ONLY               0x00008000 /* 1 Use DES key only */
 #define WBC_ACB_DONT_REQUIRE_PREAUTH           0x00010000 /* 1 Preauth not required */
-#define WBC_ACB_PW_EXPIRED                     0x00020000 /* 1 Password Expired */
+#define WBC_ACB_PW_EXPIRED                     0x00020000 /* 1 Password Expired */
 #define WBC_ACB_NO_AUTH_DATA_REQD              0x00080000   /* 1 = No authorization data required */
 
 struct wbcAuthErrorInfo {

diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c
index 6e6d2bbbf84d4f90fc18819dff9708c27ce2de00..a1646215bdff3d44e7fe977f7cb3bdb2cc8c67f6 100644 (file)
--- a/source3/nsswitch/wb_common.c
+++ b/source3/nsswitch/wb_common.c
@@ -314,7 +314,7 @@ static int winbind_open_pipe_sock(int recursing, int need_priv)
        if ((need_priv != 0) && (is_privileged == 0)) {
                winbind_close_sock();
        }
-       
+
        if (winbindd_fd != -1) {
                return winbindd_fd;
        }

diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index d5eee7e8f8ed3148e123339f5d64c9f9ef52ac4a..d14cfe94b72a0619756a77ede3dc049dbefa79bc 100644 (file)
--- a/source3/nsswitch/wbinfo.c
+++ b/source3/nsswitch/wbinfo.c
@@ -75,7 +75,7 @@ static char winbind_separator_int(bool strict)
                /* HACK: (this module should not call lp_ funtions) */
                sep = *lp_winbind_separator();
        }
-       
+
        return sep;
 }
 
@@ -1604,7 +1604,7 @@ int main(int argc, char **argv, char **envp)
                { "user-domgroups", 0, POPT_ARG_STRING, &string_arg,
                  OPT_USERDOMGROUPS, "Get user domain groups", "SID" },
                { "user-sids", 0, POPT_ARG_STRING, &string_arg, OPT_USERSIDS, "Get user group sids for user SID", "SID" },
-               { "authenticate", 'a', POPT_ARG_STRING, &string_arg, 'a', "authenticate user", "user%password" },
+               { "authenticate", 'a', POPT_ARG_STRING, &string_arg, 'a', "authenticate user", "user%password" },
                { "set-auth-user", 0, POPT_ARG_STRING, &string_arg, OPT_SET_AUTH_USER, "Store user and password used by winbindd (root only)", "user%password" },
                { "getdcname", 0, POPT_ARG_STRING, &string_arg, OPT_GETDCNAME,
                  "Get a DC name for a foreign domain", "domainname" },
@@ -1613,7 +1613,7 @@ int main(int argc, char **argv, char **envp)
                { "ping", 'p', POPT_ARG_NONE, 0, 'p', "Ping winbindd to see if it is alive" },
                { "domain", 0, POPT_ARG_STRING, &opt_domain_name, OPT_DOMAIN_NAME, "Define to the domain to restrict operation", "domain" },
 #ifdef WITH_FAKE_KASERVER
-               { "klog", 'k', POPT_ARG_STRING, &string_arg, 'k', "set an AFS token from winbind", "user%password" },
+               { "klog", 'k', POPT_ARG_STRING, &string_arg, 'k', "set an AFS token from winbind", "user%password" },
 #endif
 #ifdef HAVE_KRB5
                { "krb5auth", 'K', POPT_ARG_STRING, &string_arg, 'K', "authenticate user using Kerberos", "user%password" },
@@ -1665,7 +1665,7 @@ int main(int argc, char **argv, char **envp)
 
        load_interfaces();
 
-       pc = poptGetContext(NULL, argc, (const char **)argv, long_options, 
+       pc = poptGetContext(NULL, argc, (const char **)argv, long_options,
                            POPT_CONTEXT_KEEP_FIRST);
 
        while((opt = poptGetNextOpt(pc)) != -1) {

diff --git a/source3/nsswitch/winbind_struct_protocol.h b/source3/nsswitch/winbind_struct_protocol.h
index e16103465f21bb776ea75e778903c2e4cd444178..36873f2096f2552dc12e3f6f9c604ba97f735c24 100644 (file)
--- a/source3/nsswitch/winbind_struct_protocol.h
+++ b/source3/nsswitch/winbind_struct_protocol.h
@@ -97,7 +97,7 @@ enum winbindd_cmd {
 
        /* Lookup functions */
 
-       WINBINDD_SID_TO_UID,       
+       WINBINDD_SID_TO_UID,
        WINBINDD_SID_TO_GID,
        WINBINDD_SIDS_TO_XIDS,
        WINBINDD_UID_TO_SID,

diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index 7c4de5f6fba9543681739d7d799f79f2e36dd7a4..4c8cceb691d1434f7f1cc576ce0c15c4254f6a5f 100644 (file)
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -820,10 +820,11 @@ done:
 }
 
 /**********************************
- set a mapping. 
+ set a mapping.
 **********************************/
 
-static NTSTATUS idmap_tdb_set_mapping(struct idmap_domain *dom, const struct id_map *map)
+static NTSTATUS idmap_tdb_set_mapping(struct idmap_domain *dom,
+                                     const struct id_map *map)
 {
        struct idmap_tdb_context *ctx;
        NTSTATUS ret;
@@ -839,17 +840,19 @@ static NTSTATUS idmap_tdb_set_mapping(struct idmap_domain *dom, const struct id_
        data.dptr = NULL;
 
        /* TODO: should we filter a set_mapping using low/high filters ? */
-       
+
        ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
        switch (map->xid.type) {
 
        case ID_TYPE_UID:
-               kidstr = talloc_asprintf(ctx, "UID %lu", (unsigned long)map->xid.id);
+               kidstr = talloc_asprintf(ctx, "UID %lu",
+                                        (unsigned long)map->xid.id);
                break;
-               
+
        case ID_TYPE_GID:
-               kidstr = talloc_asprintf(ctx, "GID %lu", (unsigned long)map->xid.id);
+               kidstr = talloc_asprintf(ctx, "GID %lu",
+                                        (unsigned long)map->xid.id);
                break;
 
        default:
@@ -891,7 +894,8 @@ static NTSTATUS idmap_tdb_set_mapping(struct idmap_domain *dom, const struct id_
 
        data = tdb_fetch(ctx->tdb, ksid);
        if (data.dptr) {
-               DEBUG(10, ("Deleting existing mapping %s <-> %s\n", (const char *)data.dptr, ksidstr ));
+               DEBUG(10, ("Deleting existing mapping %s <-> %s\n",
+                          (const char *)data.dptr, ksidstr ));
                tdb_delete(ctx->tdb, data);
                tdb_delete(ctx->tdb, ksid);
                SAFE_FREE(data.dptr);
@@ -899,20 +903,23 @@ static NTSTATUS idmap_tdb_set_mapping(struct idmap_domain *dom, const struct id_
 
        data = tdb_fetch(ctx->tdb, kid);
        if (data.dptr) {
-               DEBUG(10,("Deleting existing mapping %s <-> %s\n", (const char *)data.dptr, kidstr ));
+               DEBUG(10,("Deleting existing mapping %s <-> %s\n",
+                         (const char *)data.dptr, kidstr ));
                tdb_delete(ctx->tdb, data);
                tdb_delete(ctx->tdb, kid);
                SAFE_FREE(data.dptr);
        }
 
        if (tdb_store(ctx->tdb, ksid, kid, TDB_INSERT) == -1) {
-               DEBUG(0, ("Error storing SID -> ID: %s\n", tdb_errorstr(ctx->tdb)));
+               DEBUG(0, ("Error storing SID -> ID: %s\n",
+                         tdb_errorstr(ctx->tdb)));
                tdb_chainunlock(ctx->tdb, ksid);
                ret = NT_STATUS_UNSUCCESSFUL;
                goto done;
        }
        if (tdb_store(ctx->tdb, kid, ksid, TDB_INSERT) == -1) {
-               DEBUG(0, ("Error stroing ID -> SID: %s\n", tdb_errorstr(ctx->tdb)));
+               DEBUG(0, ("Error storing ID -> SID: %s\n",
+                         tdb_errorstr(ctx->tdb)));
                /* try to remove the previous stored SID -> ID map */
                tdb_delete(ctx->tdb, ksid);
                tdb_chainunlock(ctx->tdb, ksid);
@@ -932,10 +939,11 @@ done:
 }
 
 /**********************************
- remove a mapping. 
+ remove a mapping.
 **********************************/
 
-static NTSTATUS idmap_tdb_remove_mapping(struct idmap_domain *dom, const struct id_map *map)
+static NTSTATUS idmap_tdb_remove_mapping(struct idmap_domain *dom,
+                                        const struct id_map *map)
 {
        struct idmap_tdb_context *ctx;
        NTSTATUS ret;
@@ -951,17 +959,19 @@ static NTSTATUS idmap_tdb_remove_mapping(struct idmap_domain *dom, const struct
        data.dptr = NULL;
 
        /* TODO: should we filter a remove_mapping using low/high filters ? */
-       
+
        ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
        switch (map->xid.type) {
 
        case ID_TYPE_UID:
-               kidstr = talloc_asprintf(ctx, "UID %lu", (unsigned long)map->xid.id);
+               kidstr = talloc_asprintf(ctx, "UID %lu",
+                                        (unsigned long)map->xid.id);
                break;
-               
+
        case ID_TYPE_GID:
-               kidstr = talloc_asprintf(ctx, "GID %lu", (unsigned long)map->xid.id);
+               kidstr = talloc_asprintf(ctx, "GID %lu",
+                                        (unsigned long)map->xid.id);
                break;
 
        default:
@@ -1011,16 +1021,17 @@ static NTSTATUS idmap_tdb_remove_mapping(struct idmap_domain *dom, const struct
        if ((data.dsize != kid.dsize) ||
            (memcmp(data.dptr, kid.dptr, data.dsize) != 0)) {
                DEBUG(10,("Specified SID does not map to specified ID\n"));
-               DEBUGADD(10,("Actual mapping is %s -> %s\n", ksidstr, (const char *)data.dptr));
+               DEBUGADD(10,("Actual mapping is %s -> %s\n", ksidstr,
+                        (const char *)data.dptr));
                tdb_chainunlock(ctx->tdb, ksid);
                ret = NT_STATUS_NONE_MAPPED;
                goto done;
        }
-       
+
        DEBUG(10, ("Removing %s <-> %s map\n", ksidstr, kidstr));
 
        /* Delete previous mappings. */
-       
+
        DEBUG(10, ("Deleting existing mapping %s -> %s\n", ksidstr, kidstr ));
        tdb_delete(ctx->tdb, ksid);
 

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 9e8a5a613e90b5c551609c3aa0f62d515b277d5c..82af55800ff901b9f4e35275e3b345ea63226750 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -368,7 +368,7 @@ static struct winbindd_dispatch_table {
 
        { WINBINDD_WINS_BYNAME, winbindd_wins_byname, "WINS_BYNAME" },
        { WINBINDD_WINS_BYIP, winbindd_wins_byip, "WINS_BYIP" },
-       
+
        /* End of list */
 
        { WINBINDD_NUM_CMDS, NULL, "NONE" }

diff --git a/source3/winbindd/winbindd_sid.c b/source3/winbindd/winbindd_sid.c
index d8bd8630378d46547c1ecb32282f2333d3783c2b..641b18ebbd8fbdd7ba31ca05738261374d4ed285 100644 (file)
--- a/source3/winbindd/winbindd_sid.c
+++ b/source3/winbindd/winbindd_sid.c
@@ -370,7 +370,8 @@ void winbindd_sid_to_gid(struct winbindd_cli_state *state)
           range from random SIDs. */
 
  backend:
-       winbindd_lookupsid_async( state->mem_ctx, &sid, sid2gid_lookupsid_recv, state );        
+       winbindd_lookupsid_async( state->mem_ctx, &sid, sid2gid_lookupsid_recv,
+                                 state );
 }
 
 static void set_mapping_recv(void *private_data, bool success)