Página inicial Explorar Ajuda
Entrar
erkanisik
/
main
mirror de https://github.com/pisilinux/main.git
Observar 1
Favorito 0
Fork 0
Arquivos Issues 0 Wiki
Tree: 89f8f455c5
Branches Tags
main
/
network
/
misc
/
iputils
/
files
/
fix-setuid-redeclared.patch

fix-setuid-redeclared.patch 1.7 KB
Histórico Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849 
  1. From 18f9a84e0e702841d6cc4d5f593de4fbd1348e83 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Sami Kerola <kerolasa@iki.fi>
    3. 

  3. Date: Sat, 28 Dec 2019 17:16:27 +0000
    4. 

  4. Subject: [PATCH] ninfod: change variable name to avoid colliding with function
    5. 

  5.  name
    6. 

  6. 

  7. The sys/capability.h header has 'extern int cap_setuid(uid_t uid);'
    8. 

  8. function prototype.
    9. 

  9. 

  10. Addresses: https://github.com/iputils/iputils/issues/246
    11. 

  11. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
    12. 

  12. ---
    13. 

  13.  ninfod/ninfod.c | 8 ++++----
    14. 

  14.  1 file changed, 4 insertions(+), 4 deletions(-)
    15. 

  15. 

  16. diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c
    17. 

  17. index 26112d0..95583de 100644
    18. 

  18. --- a/ninfod/ninfod.c
    19. 

  19. +++ b/ninfod/ninfod.c
    20. 

  20. @@ -455,7 +455,7 @@ static void do_daemonize(void)
    21. 

  21.  /* --------- */
    22. 

  22.  #ifdef HAVE_LIBCAP
    23. 

  23.  static const cap_value_t cap_net_raw = CAP_NET_RAW;
    24. 

  24. -static const cap_value_t cap_setuid =  CAP_SETUID; 
    25. 

  25. +static const cap_value_t cap_setuserid = CAP_SETUID;
    26. 

  26.  static cap_flag_value_t cap_ok;
    27. 

  27.  #else
    28. 

  28.  static uid_t euid;
    29. 

  29. @@ -487,7 +487,7 @@ static void limit_capabilities(void)
    30. 

  30.  
    31. 

  31.  	cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok);
    32. 

  32.  	if (cap_ok != CAP_CLEAR)
    33. 

  33. -		cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET);
    34. 

  34. +		cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET);
    35. 

  35.  
    36. 

  36.  	if (cap_set_proc(cap_p) < 0) {
    37. 

  37.  		DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno));
    38. 

  38. @@ -520,8 +520,8 @@ static void drop_capabilities(void)
    39. 

  39.  
    40. 

  40.  	/* setuid / setuid */
    41. 

  41.  	if (cap_ok != CAP_CLEAR) {
    42. 

  42. -		cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET);
    43. 

  43. -		cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET);
    44. 

  44. +		cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET);
    45. 

  45. +		cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuserid, CAP_SET);
    46. 

  46.  
    47. 

  47.  		if (cap_set_proc(cap_p) < 0) {
    48. 

  48.  			DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno));
    49. 

  49.