|
Line
Link Here
|
| 0 |
-- lib/defaults.c.orig |
0 |
++ lib/defaults.c |
|
Lines 19-25
Link Here
|
| 19 |
|
19 |
|
| 20 |
#include "list.h" |
20 |
#include "list.h" |
| 21 |
#include "defaults.h" |
21 |
#include "defaults.h" |
|
|
22 |
#ifdef HAVE_LDAP |
| 22 |
#include "lookup_ldap.h" |
23 |
#include "lookup_ldap.h" |
|
|
24 |
#endif |
| 23 |
#include "log.h" |
25 |
#include "log.h" |
| 24 |
#include "automount.h" |
26 |
#include "automount.h" |
| 25 |
|
27 |
|
|
Lines 197-202
static int parse_line(char *line, char *
Link Here
|
| 197 |
return 1; |
199 |
return 1; |
| 198 |
} |
200 |
} |
| 199 |
|
201 |
|
|
|
202 |
#ifdef HAVE_LDAP |
| 200 |
void defaults_free_uris(struct list_head *list) |
203 |
void defaults_free_uris(struct list_head *list) |
| 201 |
{ |
204 |
{ |
| 202 |
struct list_head *next; |
205 |
struct list_head *next; |
|
Lines 252-260
static unsigned int add_uris(char *value
Link Here
|
| 252 |
|
255 |
|
| 253 |
return 1; |
256 |
return 1; |
| 254 |
} |
257 |
} |
|
|
258 |
#endif |
| 255 |
|
259 |
|
| 256 |
struct list_head *defaults_get_uris(void) |
260 |
struct list_head *defaults_get_uris(void) |
| 257 |
{ |
261 |
{ |
|
|
262 |
#ifdef HAVE_LDAP |
| 258 |
FILE *f; |
263 |
FILE *f; |
| 259 |
char buf[MAX_LINE_LEN]; |
264 |
char buf[MAX_LINE_LEN]; |
| 260 |
char *res; |
265 |
char *res; |
|
Lines 288-293
struct list_head *defaults_get_uris(void
Link Here
|
| 288 |
|
292 |
|
| 289 |
fclose(f); |
293 |
fclose(f); |
| 290 |
return list; |
294 |
return list; |
|
|
295 |
#else |
| 296 |
return NULL; |
| 297 |
#endif |
| 291 |
} |
298 |
} |
| 292 |
|
299 |
|
| 293 |
/* |
300 |
/* |
|
Lines 450-455
unsigned int defaults_get_ldap_network_t
Link Here
|
| 450 |
return res; |
457 |
return res; |
| 451 |
} |
458 |
} |
| 452 |
|
459 |
|
|
|
460 |
#ifdef HAVE_LDAP |
| 453 |
struct ldap_schema *defaults_get_default_schema(void) |
461 |
struct ldap_schema *defaults_get_default_schema(void) |
| 454 |
{ |
462 |
{ |
| 455 |
struct ldap_schema *schema; |
463 |
struct ldap_schema *schema; |
|
Lines 645-650
struct ldap_schema *defaults_get_schema(
Link Here
|
| 645 |
|
653 |
|
| 646 |
return schema; |
654 |
return schema; |
| 647 |
} |
655 |
} |
|
|
656 |
#endif |
| 648 |
|
657 |
|
| 649 |
unsigned int defaults_get_mount_nfs_default_proto(void) |
658 |
unsigned int defaults_get_mount_nfs_default_proto(void) |
| 650 |
{ |
659 |
{ |
