Add files from parent branch HEAD:
[pkgsrc.git] / net / samba / patches / patch-bg
1 $NetBSD$
2
3 --- printing/nt_printing.c.orig 2007-02-04 19:09:01.000000000 +0000
4 +++ printing/nt_printing.c      2007-02-11 17:43:40.000000000 +0000
5 @@ -342,8 +342,7 @@
6         SEC_DESC *sec, *new_sec;
7         TALLOC_CTX *ctx = state;
8         int result, i;
9 -       uint32 sd_size;
10 -       size_t size_new_sec;
11 +       size_t sd_size, size_new_sec;
12         DOM_SID sid;
13  
14         if (!data.dptr || data.dsize == 0) {
15 @@ -551,28 +550,28 @@
16   
17         if (tdb_drivers)
18                 tdb_close(tdb_drivers);
19 -       tdb_drivers = tdb_open_log(lock_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
20 +       tdb_drivers = tdb_open_log(state_path("ntdrivers.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
21         if (!tdb_drivers) {
22                 DEBUG(0,("nt_printing_init: Failed to open nt drivers database %s (%s)\n",
23 -                       lock_path("ntdrivers.tdb"), strerror(errno) ));
24 +                       state_path("ntdrivers.tdb"), strerror(errno) ));
25                 return False;
26         }
27   
28         if (tdb_printers)
29                 tdb_close(tdb_printers);
30 -       tdb_printers = tdb_open_log(lock_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
31 +       tdb_printers = tdb_open_log(state_path("ntprinters.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
32         if (!tdb_printers) {
33                 DEBUG(0,("nt_printing_init: Failed to open nt printers database %s (%s)\n",
34 -                       lock_path("ntprinters.tdb"), strerror(errno) ));
35 +                       state_path("ntprinters.tdb"), strerror(errno) ));
36                 return False;
37         }
38   
39         if (tdb_forms)
40                 tdb_close(tdb_forms);
41 -       tdb_forms = tdb_open_log(lock_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
42 +       tdb_forms = tdb_open_log(state_path("ntforms.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
43         if (!tdb_forms) {
44                 DEBUG(0,("nt_printing_init: Failed to open nt forms database %s (%s)\n",
45 -                       lock_path("ntforms.tdb"), strerror(errno) ));
46 +                       state_path("ntforms.tdb"), strerror(errno) ));
47                 return False;
48         }
49