Skip to content

Commit

Permalink
Don't provide 'uint64_t' as POPT_ARG_LONG.
Browse files Browse the repository at this point in the history
Sizes might not match on some platforms.

Resolves: SSSD#6790
  • Loading branch information
alexey-tikhonov committed Nov 14, 2023
1 parent 906473a commit 374962e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/p11_child/p11_child_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ int main(int argc, const char *argv[])
char *key_id = NULL;
char *label = NULL;
char *cert_b64 = NULL;
uint64_t chain_id = 0;
long chain_id = 0;
bool wait_for_card = false;
char *uri = NULL;

Expand Down Expand Up @@ -325,7 +325,7 @@ int main(int argc, const char *argv[])
}

sss_chain_id_set_format(DEBUG_CHAIN_ID_FMT_CID);
sss_chain_id_set(chain_id);
sss_chain_id_set((uint64_t)chain_id);

DEBUG_INIT(debug_level, opt_logger);

Expand Down
4 changes: 2 additions & 2 deletions src/providers/ad/ad_gpo_child.c
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ main(int argc, const char *argv[])
poptContext pc;
int dumpable = 1;
int debug_fd = -1;
uint64_t chain_id;
long chain_id;
const char *opt_logger = NULL;
errno_t ret;
int sysvol_gpt_version = -1;
Expand Down Expand Up @@ -718,7 +718,7 @@ main(int argc, const char *argv[])
}

sss_chain_id_set_format(DEBUG_CHAIN_ID_FMT_RID);
sss_chain_id_set(chain_id);
sss_chain_id_set((uint64_t)chain_id);

DEBUG_INIT(debug_level, opt_logger);

Expand Down
4 changes: 2 additions & 2 deletions src/providers/ipa/selinux_child.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ int main(int argc, const char *argv[])
bool needs_update;
const char *username;
const char *opt_logger = NULL;
uint64_t chain_id;
long chain_id;

struct poptOption long_options[] = {
POPT_AUTOHELP
Expand Down Expand Up @@ -269,7 +269,7 @@ int main(int argc, const char *argv[])
}

sss_chain_id_set_format(DEBUG_CHAIN_ID_FMT_RID);
sss_chain_id_set(chain_id);
sss_chain_id_set((uint64_t)chain_id);

DEBUG_INIT(debug_level, opt_logger);

Expand Down
4 changes: 2 additions & 2 deletions src/providers/krb5/krb5_child.c
Original file line number Diff line number Diff line change
Expand Up @@ -4015,7 +4015,7 @@ int main(int argc, const char *argv[])
krb5_error_code kerr;
uid_t fast_uid = 0;
gid_t fast_gid = 0;
uint64_t chain_id = 0;
long chain_id = 0;
struct cli_opts cli_opts = { 0 };
int sss_creds_password = 0;
long dummy_long = 0;
Expand Down Expand Up @@ -4111,7 +4111,7 @@ int main(int argc, const char *argv[])
}

sss_chain_id_set_format(DEBUG_CHAIN_ID_FMT_RID);
sss_chain_id_set(chain_id);
sss_chain_id_set((uint64_t)chain_id);

DEBUG_INIT(debug_level, opt_logger);

Expand Down
2 changes: 1 addition & 1 deletion src/providers/proxy/proxy_child.c
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ int main(int argc, const char *argv[])
debug_log_file = talloc_asprintf(NULL, "proxy_child_%s", domain);
if (!debug_log_file) return 2;

sss_chain_id_set(chain_id);
sss_chain_id_set((uint64_t)chain_id);

DEBUG_INIT(debug_level, opt_logger);

Expand Down

0 comments on commit 374962e

Please sign in to comment.