/apps/net/samba-current/samba-sambagroups.patch

https://github.com/tenchman/TTLinux · Patch · 168 lines · 166 code · 2 blank · 0 comment · 0 complexity · 91d7aad98633a60a87ab6c9b6ac9d92c MD5 · raw file 

    

  1. --- source/Makefile.in.sambagroups	2007-03-08 09:57:26.000000000 +0100
    2. 

  2. +++ source/Makefile.in	2007-03-08 09:52:34.000000000 +0100
    3. 

  3. @@ -735,7 +735,7 @@
    4. 

  4.  		$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
    5. 

  5.  		$(LIBADS_SERVER_OBJ) $(SERVER_MUTEX_OBJ)
    6. 

  6.  
    7. 

  7. -WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
    8. 

  8. +WBINFO_OBJ = nsswitch/wbinfo.o nsswitch/sambagroups.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
    9. 

  9.  		$(SECRETS_OBJ) $(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) $(RPC_PARSE_OBJ1) $(DOSERR_OBJ)
    10. 

  10.  
    11. 

  11.  WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) lib/replace1.o @WINBIND_NSS_EXTRA_OBJS@
    12. 

  12. --- source/nsswitch/wbinfo.c.sambagroups	2007-03-08 09:57:08.000000000 +0100
    13. 

  13. +++ source/nsswitch/wbinfo.c	2007-03-08 09:23:24.000000000 +0100
    14. 

  14. @@ -1149,6 +1149,7 @@ int main(int argc, char **argv)
    15. 

  15.  			/* "user%password,DOM\\user%password,user@EXAMPLE.COM,EXAMPLE.COM\\user%password" }, */
    16. 

  16.  #endif
    17. 

  17.  		{ "separator", 0, POPT_ARG_NONE, 0, OPT_SEPARATOR, "Get the active winbind separator", NULL },
    18. 

  18. +		{ "sambagroups", 'L', POPT_ARG_NONE, 0, 'L', "Listener for squid's group requests", NULL },
    19. 

  19.  		POPT_COMMON_VERSION
    20. 

  20.  		POPT_TABLEEND
    21. 

  21.  	};
    22. 

  22. @@ -1375,6 +1376,9 @@ int main(int argc, char **argv)
    23. 

  23.  				goto done;
    24. 

  24.  			}
    25. 

  25.  			break;
    26. 

  26. +		case 'L':
    27. 

  27. +		  sambagroups_listener();
    28. 

  28. +		  break;
    29. 

  29.  		case 'p':
    30. 

  30.  			if (!wbinfo_ping()) {
    31. 

  31.  				d_fprintf(stderr, "could not ping winbindd!\n");
    32. 

  32. --- source/nsswitch/sambagroups.c.sambagroups	2007-03-08 09:51:44.000000000 +0100
    33. 

  33. +++ source/nsswitch/sambagroups.c	2007-03-08 16:35:59.000000000 +0100
    34. 

  34. @@ -0,0 +1,134 @@
    35. 

  35. +#include <stdlib.h>
    36. 

  36. +#include <fcntl.h>
    37. 

  37. +#include <unistd.h>
    38. 

  38. +#include <stdio.h>
    39. 

  39. +#include <errno.h>
    40. 

  40. +#include <ctype.h>
    41. 

  41. +#include <string.h>
    42. 

  42. +
    43. 

  43. +#include <sys/file.h>
    44. 

  44. +#include <sys/stat.h>
    45. 

  45. +
    46. 

  46. +#include "includes.h"
    47. 

  47. +#include "winbindd.h"
    48. 

  48. +
    49. 

  49. +#define READSIZ 1024
    50. 

  50. +
    51. 

  51. +#define writec(__fd, __chr) write(__fd, __chr, strlen(__chr))
    52. 

  52. +static int inputfd = 0;
    53. 

  53. +static int outputfd = 1;
    54. 

  54. +
    55. 

  55. +char domainsep = '+';
    56. 

  56. +
    57. 

  57. +int sambagroups_lookup(char * user, char *group)
    58. 

  58. +{
    59. 

  59. +  struct winbindd_request request;
    60. 

  60. +  struct winbindd_response response;
    61. 

  61. +  char *domain, *t;
    62. 

  62. +  int gid, i;
    63. 

  63. +
    64. 

  64. +  /* Send off request */
    65. 

  65. +  
    66. 

  66. +  ZERO_STRUCT(request);
    67. 

  67. +  ZERO_STRUCT(response);
    68. 

  68. +  
    69. 

  69. +  if (!user) {
    70. 

  70. +    writec(outputfd, "ERROR: user missing\n"); 
    71. 

  71. +    return -1;
    72. 

  72. +  }
    73. 

  73. +  if (!group) {
    74. 

  74. +    writec(outputfd, "ERROR: group missing\n"); 
    75. 

  75. +    return -1;
    76. 

  76. +  }
    77. 

  77. + 
    78. 

  78. +  /* lookup group sid */
    79. 

  79. +  if ((t = strchr(user, domainsep))) {
    80. 

  80. +    domain = user;
    81. 

  81. +    *t = '\0';
    82. 

  82. +    fstrcpy(request.data.name.dom_name, domain);
    83. 

  83. +    *t = '+';
    84. 

  84. +  } 
    85. 

  85. +
    86. 

  86. +  fstrcpy(request.data.name.name, group);
    87. 

  87. +
    88. 

  88. +  
    89. 

  89. +  if (winbindd_request_response(WINBINDD_LOOKUPNAME, &request, &response) !=
    90. 

  90. +      NSS_STATUS_SUCCESS) {
    91. 

  91. +    writec(outputfd, "ERROR: cannot lookup group sid\n"); 
    92. 

  92. +    return -1;
    93. 

  93. +  }
    94. 

  94. +
    95. 

  95. +  ZERO_STRUCT(request);  
    96. 

  96. +  fstrcpy(request.data.sid, response.data.sid.sid);
    97. 

  97. +  ZERO_STRUCT(response);
    98. 

  98. +
    99. 

  99. +  if (winbindd_request_response(WINBINDD_SID_TO_GID, &request, &response) !=
    100. 

  100. +      NSS_STATUS_SUCCESS) {
    101. 

  101. +    writec(outputfd, "ERROR: cannot convert sid to gid\n"); 
    102. 

  102. +    return -1;
    103. 

  103. +  }
    104. 

  104. +
    105. 

  105. +  gid = (int)response.data.gid;
    106. 

  106. +
    107. 

  107. +  
    108. 

  108. +
    109. 

  109. +  ZERO_STRUCT(request);
    110. 

  110. +  ZERO_STRUCT(response);
    111. 

  111. +  
    112. 

  112. +  /* do we need domain+user? */
    113. 

  113. +  fstrcpy(request.data.username, user);
    114. 

  114. +  
    115. 

  115. +  if (NSS_STATUS_SUCCESS != winbindd_request_response(WINBINDD_GETGROUPS, &request, &response)) {
    116. 

  116. +    writec(outputfd, "ERROR: cannot lookup user groups\n");
    117. 

  117. +    return -1;
    118. 

  118. +  }
    119. 

  119. +  
    120. 

  120. +  for (i = 0; i < response.data.num_entries; i++)
    121. 

  121. +    if (gid == (int)((gid_t *)response.extra_data.data)[i]) {
    122. 

  122. +      SAFE_FREE(response.extra_data.data);
    123. 

  123. +      return 0;
    124. 

  124. +    }
    125. 

  125. +
    126. 

  126. +  
    127. 

  127. +  SAFE_FREE(response.extra_data.data);
    128. 

  128. +  return -1;
    129. 

  129. +}
    130. 

  130. +
    131. 

  131. +int sambagroups_listener() {
    132. 

  132. +  char buf[READSIZ];
    133. 

  133. +  int rlen;
    134. 

  134. +  fd_set rfds;
    135. 

  135. +
    136. 

  136. +
    137. 

  137. +  while (1) {
    138. 

  138. +    FD_ZERO(&rfds);
    139. 

  139. +    FD_SET(inputfd, &rfds);
    140. 

  140. +    
    141. 

  141. +    if (-1 == select(inputfd + 1, &rfds, NULL, NULL, NULL))
    142. 

  142. +      continue;
    143. 

  143. +
    144. 

  144. +    if (0 < (rlen = read(inputfd, buf, READSIZ-1))) {
    145. 

  145. +      char *user = NULL;
    146. 

  146. +      char  *group = NULL;
    147. 

  147. +
    148. 

  148. +      buf[rlen - 1] = '\0';
    149. 

  149. +      
    150. 

  150. +      user = buf;
    151. 

  151. +      if ((group = strchr(user, ' '))) {
    152. 

  152. +	*group = '\0';
    153. 

  153. +	group++;
    154. 

  154. +      }
    155. 

  155. +
    156. 

  156. +      if (-1 == sambagroups_lookup(user, group))
    157. 

  157. +	writec(outputfd, "ERR\n");
    158. 

  158. +      else
    159. 

  159. +	writec(outputfd, "OK\n");
    160. 

  160. +    } else {
    161. 

  161. +      /* read error or emtpy read */
    162. 

  162. +      exit(23);
    163. 

  163. +    }
    164. 

  164. +
    165. 

  165. +  }
    166. 

  166. +  
    167. 

  167. +}
    168. 

  168. +
    169.