File: smbpass.c

package info (click to toggle)
samba 1.9.18p8-2
  • links: PTS
  • area: main
  • in suites: hamm
  • size: 6,404 kB
  • ctags: 6,517
  • sloc: ansic: 60,637; sh: 1,095; perl: 650; makefile: 565; awk: 120; csh: 110
file content (880 lines) | stat: -rw-r--r-- 20,547 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
/*
 * Unix SMB/Netbios implementation. Version 1.9. SMB parameters and setup
 * Copyright (C) Andrew Tridgell 1992-1998 Modified by Jeremy Allison 1995.
 * 
 * This program is free software; you can redistribute it and/or modify it under
 * the terms of the GNU General Public License as published by the Free
 * Software Foundation; either version 2 of the License, or (at your option)
 * any later version.
 * 
 * This program is distributed in the hope that it will be useful, but WITHOUT
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 * more details.
 * 
 * You should have received a copy of the GNU General Public License along with
 * this program; if not, write to the Free Software Foundation, Inc., 675
 * Mass Ave, Cambridge, MA 02139, USA.
 */

#include "includes.h"

extern int      DEBUGLEVEL;

int             gotalarm;

void 
gotalarm_sig(void)
{
	gotalarm = 1;
}

int 
do_pw_lock(int fd, int waitsecs, int type)
{
	struct flock    lock;
	int             ret;

	gotalarm = 0;
	signal(SIGALRM, SIGNAL_CAST gotalarm_sig);

	lock.l_type = type;
	lock.l_whence = SEEK_SET;
	lock.l_start = 0;
	lock.l_len = 1;
	lock.l_pid = 0;

	alarm(5);
	ret = fcntl(fd, F_SETLKW, &lock);
	alarm(0);
	signal(SIGALRM, SIGNAL_CAST SIG_DFL);

	if (gotalarm) {
		DEBUG(0, ("do_pw_lock: failed to %s SMB passwd file.\n",
			  type == F_UNLCK ? "unlock" : "lock"));
		return -1;
	}
	return ret;
}

int pw_file_lock(char *name, int type, int secs)
{
	int fd = open(name, O_RDWR | O_CREAT, 0600);
	if (fd < 0)
		return (-1);
	if (do_pw_lock(fd, secs, type)) {
		close(fd);
		return -1;
	}
	return fd;
}

int pw_file_unlock(int fd)
{
	do_pw_lock(fd, 5, F_UNLCK);
	return close(fd);
}

/*
 * Routine to get the next 32 hex characters and turn them
 * into a 16 byte array.
 */

static int gethexpwd(char *p, char *pwd)
{
	int i;
	unsigned char   lonybble, hinybble;
	char           *hexchars = "0123456789ABCDEF";
	char           *p1, *p2;

	for (i = 0; i < 32; i += 2) {
		hinybble = toupper(p[i]);
		lonybble = toupper(p[i + 1]);
 
		p1 = strchr(hexchars, hinybble);
		p2 = strchr(hexchars, lonybble);
		if (!p1 || !p2)
			return (False);
		hinybble = PTR_DIFF(p1, hexchars);
		lonybble = PTR_DIFF(p2, hexchars);
 
		pwd[i / 2] = (hinybble << 4) | lonybble;
	}
	return (True);
}

/*************************************************************************
 Routine to search the smbpasswd file for an entry matching the username
 or user id.  if the name is NULL, then the smb_uid is used instead.
 *************************************************************************/
struct smb_passwd *get_smbpwd_entry(char *name, int smb_userid)
{
	/* Static buffers we will return. */
	static struct smb_passwd pw_buf;
	static pstring  user_name;
	static unsigned char smbpwd[16];
	static unsigned char smbntpwd[16];
	char            linebuf[256];
	char            readbuf[16 * 1024];
	unsigned char   c;
	unsigned char  *p;
	long            uidval;
	long            linebuf_len;
	FILE           *fp;
	int             lockfd;
	char           *pfile = lp_smb_passwd_file();

        pw_buf.acct_ctrl = ACB_NORMAL;
        pw_buf.smb_passwd = NULL;
        pw_buf.smb_nt_passwd = NULL;

	if (!*pfile) {
		DEBUG(0, ("No SMB password file set\n"));
		return (NULL);
	}
	DEBUG(10, ("get_smbpwd_entry: opening file %s\n", pfile));

	if (name != NULL)
	{
		DEBUG(10, ("get_smbpwd_entry: search by name: %s\n", name));
	}
	else
	{
		DEBUG(10, ("get_smbpwd_entry: search by smb_userid: %x\n", smb_userid));
	}

	fp = fopen(pfile, "r");

	if (fp == NULL) {
		DEBUG(0, ("get_smbpwd_entry: unable to open file %s\n", pfile));
		return NULL;
	}
	/* Set a 16k buffer to do more efficient reads */
	setvbuf(fp, readbuf, _IOFBF, sizeof(readbuf));

	if ((lockfd = pw_file_lock(pfile, F_RDLCK, 5)) < 0) {
		DEBUG(0, ("get_smbpwd_entry: unable to lock file %s\n", pfile));
		fclose(fp);
		return NULL;
	}
	/* make sure it is only rw by the owner */
	chmod(pfile, 0600);

	/* We have a read lock on the file. */
	/*
	 * Scan the file, a line at a time and check if the name matches.
	 */
	while (!feof(fp)) {
		linebuf[0] = '\0';

		fgets(linebuf, 256, fp);
		if (ferror(fp)) {
			fclose(fp);
			pw_file_unlock(lockfd);
			return NULL;
		}
		/*
		 * Check if the string is terminated with a newline - if not
		 * then we must keep reading and discard until we get one.
		 */
		linebuf_len = strlen(linebuf);
		if (linebuf[linebuf_len - 1] != '\n') {
			c = '\0';
			while (!ferror(fp) && !feof(fp)) {
				c = fgetc(fp);
				if (c == '\n')
					break;
			}
		} else
			linebuf[linebuf_len - 1] = '\0';

#ifdef DEBUG_PASSWORD
		DEBUG(100, ("get_smbpwd_entry: got line |%s|\n", linebuf));
#endif
		if ((linebuf[0] == 0) && feof(fp)) {
			DEBUG(4, ("get_smbpwd_entry: end of file reached\n"));
			break;
		}
		/*
		 * The line we have should be of the form :-
		 * 
		 * username:uid:[32hex bytes]:....other flags presently
		 * ignored....
		 * 
		 * or,
		 *
		 * username:uid:[32hex bytes]:[32hex bytes]:....ignored....
		 *
		 * if Windows NT compatible passwords are also present.
		 */

		if (linebuf[0] == '#' || linebuf[0] == '\0') {
			DEBUG(6, ("get_smbpwd_entry: skipping comment or blank line\n"));
			continue;
		}
		p = (unsigned char *) strchr(linebuf, ':');
		if (p == NULL) {
			DEBUG(0, ("get_smbpwd_entry: malformed password entry (no :)\n"));
			continue;
		}
		/*
		 * As 256 is shorter than a pstring we don't need to check
		 * length here - if this ever changes....
		 */
		strncpy(user_name, linebuf, PTR_DIFF(p, linebuf));
		user_name[PTR_DIFF(p, linebuf)] = '\0';

		/* get smb uid */

		p++;		/* Go past ':' */
		if (!isdigit(*p)) {
			DEBUG(0, ("get_smbpwd_entry: malformed password entry (uid not number)\n"));
			continue;
		}

		uidval = atoi((char *) p);

		while (*p && isdigit(*p))
		{
			p++;
		}

		if (*p != ':')
		{
			DEBUG(0, ("get_smbpwd_entry: malformed password entry (no : after uid)\n"));
			continue;
		}

		if (name != NULL)
		{
			/* search is by user name */
			if (!strequal(user_name, name)) continue;
			DEBUG(10, ("get_smbpwd_entry: found by name: %s\n", user_name));
		}
		else
		{
			/* search is by user id */
			if (uidval != smb_userid) continue;
			DEBUG(10, ("get_smbpwd_entry: found by smb_userid: %x\n", uidval));
		}

		/* if we're here, the entry has been found (either by name or uid) */

		/*
		 * Now get the password value - this should be 32 hex digits
		 * which are the ascii representations of a 16 byte string.
		 * Get two at a time and put them into the password.
		 */

		/* skip the ':' */
		p++;

		if (*p == '*' || *p == 'X')
		{
			/* Password deliberately invalid - end here. */
			DEBUG(10, ("get_smbpwd_entry: entry invalidated for user %s\n", user_name));
			fclose(fp);
			pw_file_unlock(lockfd);
			return NULL;
		}

		if (linebuf_len < (PTR_DIFF(p, linebuf) + 33))
		{
			DEBUG(0, ("get_smbpwd_entry: malformed password entry (passwd too short)\n"));
			fclose(fp);
			pw_file_unlock(lockfd);
			return (False);
		}

		if (p[32] != ':')
		{
			DEBUG(0, ("get_smbpwd_entry: malformed password entry (no terminating :)\n"));
			fclose(fp);
			pw_file_unlock(lockfd);
			return NULL;
		}

		if (!strncasecmp((char *) p, "NO PASSWORD", 11))
		{
			pw_buf.smb_passwd = NULL;
                        /*
                         * We set this so that the caller can tell
                         * that there was no old password.
                         */
                        pw_buf.acct_ctrl |= ACB_PWNOTREQ;
		}
		else
		{
			if (!gethexpwd((char *)p, (char *)smbpwd))
			{
				DEBUG(0, ("Malformed Lanman password entry (non hex chars)\n"));
				fclose(fp);
				pw_file_unlock(lockfd);
				return NULL;
			}
			pw_buf.smb_passwd = smbpwd;
		}

		pw_buf.smb_name = user_name;
		pw_buf.smb_userid = uidval;
		pw_buf.smb_nt_passwd = NULL;

		/* Now check if the NT compatible password is
			available. */
		p += 33; /* Move to the first character of the line after
					the lanman password. */
		if ((linebuf_len >= (PTR_DIFF(p, linebuf) + 33)) && (p[32] == ':')) {
			if (*p != '*' && *p != 'X') {
				if(gethexpwd((char *)p,(char *)smbntpwd))
					pw_buf.smb_nt_passwd = smbntpwd;
			}
		}

		fclose(fp);
		pw_file_unlock(lockfd);
		DEBUG(5, ("get_smbpwd_entry: returning passwd entry for user %s, uid %d\n",
			  user_name, uidval));
		return &pw_buf;
	}

	fclose(fp);
	pw_file_unlock(lockfd);
	return NULL;
}

/*
 * Routine to search the smbpasswd file for an entry matching the username.
 */
BOOL add_smbpwd_entry(struct smb_passwd* pwd)
{
	/* Static buffers we will return. */
	static pstring  user_name;

	char            linebuf[256];
	char            readbuf[16 * 1024];
	unsigned char   c;
	unsigned char  *p;
	long            linebuf_len;
	FILE           *fp;
	int             lockfd;
	char           *pfile = lp_smb_passwd_file();

	int i;
	int wr_len;

	int fd;
	int new_entry_length;
	uchar *new_entry;
	long offpos;

	if (!*pfile)
	{
		DEBUG(0, ("No SMB password file set\n"));
		return False;
	}
	DEBUG(10, ("add_smbpwd_entry: opening file %s\n", pfile));

	fp = fopen(pfile, "r+");

	if (fp == NULL)
	{
		DEBUG(0, ("add_smbpwd_entry: unable to open file %s\n", pfile));
		return False;
	}
	/* Set a 16k buffer to do more efficient reads */
	setvbuf(fp, readbuf, _IOFBF, sizeof(readbuf));

	if ((lockfd = pw_file_lock(pfile, F_WRLCK, 5)) < 0)
	{
		DEBUG(0, ("add_smbpwd_entry: unable to lock file %s\n", pfile));
		fclose(fp);
		return False;
	}
	/* make sure it is only rw by the owner */
	chmod(pfile, 0600);

	/* We have a write lock on the file. */
	/*
	* Scan the file, a line at a time and check if the name matches.
	*/
	while (!feof(fp))
	{
		linebuf[0] = '\0';

		fgets(linebuf, 256, fp);
		if (ferror(fp))
		{
			fclose(fp);
			pw_file_unlock(lockfd);
			return False;
		}

		/*
		 * Check if the string is terminated with a newline - if not
		 * then we must keep reading and discard until we get one.
		 */
		linebuf_len = strlen(linebuf);
		if (linebuf[linebuf_len - 1] != '\n')
		{
			c = '\0';
			while (!ferror(fp) && !feof(fp))
			{
				c = fgetc(fp);
				if (c == '\n')
				{
					break;
				}
			}
		}
		else
		{
			linebuf[linebuf_len - 1] = '\0';
		}

#ifdef DEBUG_PASSWORD
		DEBUG(100, ("add_smbpwd_entry: got line |%s|\n", linebuf));
#endif

		if ((linebuf[0] == 0) && feof(fp))
		{
			DEBUG(4, ("add_smbpwd_entry: end of file reached\n"));
			break;
		}

		/*
		* The line we have should be of the form :-
		* 
		* username:uid:[32hex bytes]:....other flags presently
		* ignored....
		* 
		* or,
		*
		* username:uid:[32hex bytes]:[32hex bytes]:....ignored....
		*
		* if Windows NT compatible passwords are also present.
		*/

		if (linebuf[0] == '#' || linebuf[0] == '\0')
		{
			DEBUG(6, ("add_smbpwd_entry: skipping comment or blank line\n"));
			continue;
		}

		p = (unsigned char *) strchr(linebuf, ':');

		if (p == NULL)
		{
			DEBUG(0, ("add_smbpwd_entry: malformed password entry (no :)\n"));
			continue;
		}

		/*
		 * As 256 is shorter than a pstring we don't need to check
		 * length here - if this ever changes....
		 */
		strncpy(user_name, linebuf, PTR_DIFF(p, linebuf));
		user_name[PTR_DIFF(p, linebuf)] = '\0';
		if (strequal(user_name, pwd->smb_name))
		{
			DEBUG(6, ("add_smbpwd_entry: entry already exists\n"));
			return False;
		}
	}

	/* ok - entry doesn't exist.  we can add it */

	/* Create a new smb passwd entry and set it to the given password. */
	/* The add user write needs to be atomic - so get the fd from 
	   the fp and do a raw write() call.
	 */
	fd = fileno(fp);

	if((offpos = lseek(fd, 0, SEEK_END)) == -1)
	{
		DEBUG(0, ("add_smbpwd_entry(lseek): Failed to add entry for user %s to file %s. \
Error was %s\n", pwd->smb_name, pfile, strerror(errno)));

		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}

	new_entry_length = strlen(pwd->smb_name) + 1 + 15 + 1 + 32 + 1 + 32 + 1 + 2;

	if((new_entry = (uchar *)malloc( new_entry_length )) == 0)
	{
		DEBUG(0, ("add_smbpwd_entry(malloc): Failed to add entry for user %s to file %s. \
Error was %s\n", 
		pwd->smb_name, pfile, strerror(errno)));

		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}

	slprintf((char *)new_entry, new_entry_length - 1, "%s:%u:", pwd->smb_name, (unsigned)pwd->smb_userid);
	p = (unsigned char *)&new_entry[strlen((char *)new_entry)];

	for( i = 0; i < 16; i++)
	{
		slprintf((char *)&p[i*2], new_entry_length - (p - new_entry) - 1,"%02X", pwd->smb_passwd[i]);
	}
	p += 32;

	*p++ = ':';

	for( i = 0; i < 16; i++)
	{
		slprintf((char *)&p[i*2], new_entry_length - (p - new_entry) - 1, "%02X", pwd->smb_nt_passwd[i]);
	}
	p += 32;

	*p++ = ':';
	slprintf((char *)p, new_entry_length - (p - new_entry) - 1, "\n");

#ifdef DEBUG_PASSWORD
		DEBUG(100, ("add_smbpwd_entry(%d): new_entry_len %d entry_len %d made line |%s|\n", 
		             fd, new_entry_length, strlen(new_entry), new_entry));
#endif

	if ((wr_len = write(fd, new_entry, strlen((char *)new_entry))) != strlen((char *)new_entry))
	{
		DEBUG(0, ("add_smbpwd_entry(write): %d Failed to add entry for user %s to file %s. \
Error was %s\n", wr_len, pwd->smb_name, pfile, strerror(errno)));

		/* Remove the entry we just wrote. */
		if(ftruncate(fd, offpos) == -1)
		{
			DEBUG(0, ("add_smbpwd_entry: ERROR failed to ftruncate file %s. \
Error was %s. Password file may be corrupt ! Please examine by hand !\n", 
			pwd->smb_name, strerror(errno)));
		}

		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}

	fclose(fp);
	pw_file_unlock(lockfd);
	return True;
}
/*
 * Routine to search the smbpasswd file for an entry matching the username.
 * and then modify its password entry
 * override = 0, normal
 * override = 1, don't care about XXXXXXXX'd out password or NO PASS
 */

BOOL mod_smbpwd_entry(struct smb_passwd* pwd, BOOL override)
{
	/* Static buffers we will return. */
	static pstring  user_name;

	char            linebuf[256];
	char            readbuf[16 * 1024];
	unsigned char   c;
	char            ascii_p16[66];
	unsigned char  *p = NULL;
	long            linebuf_len = 0;
	FILE           *fp;
	int             lockfd;
	char           *pfile = lp_smb_passwd_file();
	BOOL found_entry = False;

	long pwd_seekpos = 0;

	int i;
	int wr_len;
	int fd;

	if (!*pfile)
	{
		DEBUG(0, ("No SMB password file set\n"));
		return False;
	}
	DEBUG(10, ("mod_smbpwd_entry: opening file %s\n", pfile));

	fp = fopen(pfile, "r+");

	if (fp == NULL)
	{
		DEBUG(0, ("mod_smbpwd_entry: unable to open file %s\n", pfile));
		return False;
	}
	/* Set a 16k buffer to do more efficient reads */
	setvbuf(fp, readbuf, _IOFBF, sizeof(readbuf));

	if ((lockfd = pw_file_lock(pfile, F_WRLCK, 5)) < 0)
	{
		DEBUG(0, ("mod_smbpwd_entry: unable to lock file %s\n", pfile));
		fclose(fp);
		return False;
	}
	/* make sure it is only rw by the owner */
	chmod(pfile, 0600);

	/* We have a write lock on the file. */
	/*
	* Scan the file, a line at a time and check if the name matches.
	*/
	while (!feof(fp))
	{
		pwd_seekpos = ftell(fp);

		linebuf[0] = '\0';

		fgets(linebuf, 256, fp);
		if (ferror(fp))
		{
			fclose(fp);
			pw_file_unlock(lockfd);
			return False;
		}

		/*
		 * Check if the string is terminated with a newline - if not
		 * then we must keep reading and discard until we get one.
		 */
		linebuf_len = strlen(linebuf);
		if (linebuf[linebuf_len - 1] != '\n')
		{
			c = '\0';
			while (!ferror(fp) && !feof(fp))
			{
				c = fgetc(fp);
				if (c == '\n')
				{
					break;
				}
			}
		}
		else
		{
			linebuf[linebuf_len - 1] = '\0';
		}

#ifdef DEBUG_PASSWORD
		DEBUG(100, ("mod_smbpwd_entry: got line |%s|\n", linebuf));
#endif

		if ((linebuf[0] == 0) && feof(fp))
		{
			DEBUG(4, ("mod_smbpwd_entry: end of file reached\n"));
			break;
		}

		/*
		* The line we have should be of the form :-
		* 
		* username:uid:[32hex bytes]:....other flags presently
		* ignored....
		* 
		* or,
		*
		* username:uid:[32hex bytes]:[32hex bytes]:....ignored....
		*
		* if Windows NT compatible passwords are also present.
		*/

		if (linebuf[0] == '#' || linebuf[0] == '\0')
		{
			DEBUG(6, ("mod_smbpwd_entry: skipping comment or blank line\n"));
			continue;
		}

		p = (unsigned char *) strchr(linebuf, ':');

		if (p == NULL)
		{
			DEBUG(0, ("mod_smbpwd_entry: malformed password entry (no :)\n"));
			continue;
		}

		/*
		 * As 256 is shorter than a pstring we don't need to check
		 * length here - if this ever changes....
		 */
		strncpy(user_name, linebuf, PTR_DIFF(p, linebuf));
		user_name[PTR_DIFF(p, linebuf)] = '\0';
		if (strequal(user_name, pwd->smb_name))
		{
			found_entry = True;
			break;
		}
	}

	if (!found_entry) return False;

	DEBUG(6, ("mod_smbpwd_entry: entry exists\n"));

	/* User name matches - get uid and password */
	p++;		/* Go past ':' */

	if (!isdigit(*p))
	{
		DEBUG(0, ("mod_smbpwd_entry: malformed password entry (uid not number)\n"));
		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}

	while (*p && isdigit(*p))
		p++;
	if (*p != ':')
	{
		DEBUG(0, ("mod_smbpwd_entry: malformed password entry (no : after uid)\n"));
		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}
	/*
	 * Now get the password value - this should be 32 hex digits
	 * which are the ascii representations of a 16 byte string.
	 * Get two at a time and put them into the password.
	 */
	p++;

	/* record exact password position */
	pwd_seekpos += PTR_DIFF(p, linebuf);

	if (!override && (*p == '*' || *p == 'X'))
	{
		/* Password deliberately invalid - end here. */
		DEBUG(10, ("get_smbpwd_entry: entry invalidated for user %s\n", user_name));
		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}

	if (linebuf_len < (PTR_DIFF(p, linebuf) + 33))
	{
		DEBUG(0, ("mod_smbpwd_entry: malformed password entry (passwd too short)\n"));
		fclose(fp);
		pw_file_unlock(lockfd);
		return (False);
	}

	if (p[32] != ':')
	{
		DEBUG(0, ("mod_smbpwd_entry: malformed password entry (no terminating :)\n"));
		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}

	if (!override && (*p == '*' || *p == 'X'))
	{
		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}

	/* Now check if the NT compatible password is
		available. */
	p += 33; /* Move to the first character of the line after
				the lanman password. */
	if (linebuf_len < (PTR_DIFF(p, linebuf) + 33))
	{
		DEBUG(0, ("mod_smbpwd_entry: malformed password entry (passwd too short)\n"));
		fclose(fp);
		pw_file_unlock(lockfd);
		return (False);
	}

	if (p[32] != ':')
	{
		DEBUG(0, ("mod_smbpwd_entry: malformed password entry (no terminating :)\n"));
		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}

        /* The following check is wrong - the NT hash is optional. */
#if 0
	if (*p == '*' || *p == 'X')
	{
		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}
#endif

	/* whew.  entry is correctly formed. */

	/*
	 * Do an atomic write into the file at the position defined by
	 * seekpos.
	 */

	/* The mod user write needs to be atomic - so get the fd from 
	   the fp and do a raw write() call.
	 */

	fd = fileno(fp);

	if (lseek(fd, pwd_seekpos - 1, SEEK_SET) != pwd_seekpos - 1)
	{
		DEBUG(1, ("mod_smbpwd_entry: seek fail on file %s.\n", pfile));
			fclose(fp);
			pw_file_unlock(lockfd);
			return False;
	}

	/* Sanity check - ensure the character is a ':' */
	if (read(fd, &c, 1) != 1)
	{
		DEBUG(1, ("mod_smbpwd_entry: read fail on file %s.\n", pfile));
		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}

	if (c != ':')
	{
		DEBUG(1, ("mod_smbpwd_entry: check on passwd file %s failed.\n", pfile));
		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}
 
	/* Create the 32 byte representation of the new p16 */
	for (i = 0; i < 16; i++)
	{
		slprintf(&ascii_p16[i*2], sizeof(ascii_p16) - (i*2) - 1, 
                        "%02X", (uchar) pwd->smb_passwd[i]);
	}
	/* Add on the NT md4 hash */
	ascii_p16[32] = ':';
	wr_len = 65;
	if (pwd->smb_nt_passwd != NULL)
	{
		for (i = 0; i < 16; i++)
		{
			slprintf(&ascii_p16[(i*2)+33], sizeof(ascii_p16) - (i*2) - 32, 
                                 "%02X", (uchar) pwd->smb_nt_passwd[i]);
		}
	}
	else	
	{
		/* No NT hash - write out an 'invalid' string. */
		fstrcpy(&ascii_p16[33], "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
	}

#ifdef DEBUG_PASSWORD
	DEBUG(100,("mod_smbpwd_entry: "));
	dump_data(100, ascii_p16, wr_len);
#endif

	if (write(fd, ascii_p16, wr_len) != wr_len)
	{
		DEBUG(1, ("mod_smbpwd_entry: write failed in passwd file %s\n", pfile));
		fclose(fp);
		pw_file_unlock(lockfd);
		return False;
	}

	fclose(fp);
	pw_file_unlock(lockfd);
	return True;
}