/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/password-prompt.c

  • Committer: Teddy Hogeborn
  • Date: 2008-08-25 06:44:13 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080825064413-smqg5qwxfvhkeop4
* Makefile (DOCBOOKTOMAN): Only cd to one directory.

* mandos-options.xml (interface): Removed mention of a specific
                                  replaceable.
  (debug): Reworded slightly.

* mandos.conf.xml (OPTIONS): Renamed some replaceable names.

* mandos.xml (SYNOPSIS, OPTIONS): Renamed replaceable of "interface"
                                  from "IF" to "NAME".

Show diffs side-by-side

added added

removed removed

Lines of Context:
36
36
#include <stddef.h>             /* NULL, size_t, ssize_t */
37
37
#include <sys/types.h>          /* ssize_t */
38
38
#include <stdlib.h>             /* EXIT_SUCCESS, EXIT_FAILURE,
39
 
                                   getopt_long */
 
39
                                   getopt_long, getenv() */
40
40
#include <stdio.h>              /* fprintf(), stderr, getline(),
41
41
                                   stdin, feof(), perror(), fputc(),
42
42
                                   stdout, getopt_long */
184
184
    }
185
185
 
186
186
    if(prefix){
187
 
      fprintf(stderr, "%s Password: ", prefix);
188
 
    } else {
189
 
      fprintf(stderr, "Password: ");
190
 
    }      
 
187
      fprintf(stderr, "%s ", prefix);
 
188
    }
 
189
    {
 
190
      const char *cryptsource = getenv("cryptsource");
 
191
      const char *crypttarget = getenv("crypttarget");
 
192
      const char *const prompt
 
193
        = "Enter passphrase to unlock the disk";
 
194
      if(cryptsource == NULL){
 
195
        if(crypttarget == NULL){
 
196
          fprintf(stderr, "%s: ", prompt);
 
197
        } else {
 
198
          fprintf(stderr, "%s (%s): ", prompt, crypttarget);
 
199
        }
 
200
      } else {
 
201
        if(crypttarget == NULL){
 
202
          fprintf(stderr, "%s %s: ", prompt, cryptsource);
 
203
        } else {
 
204
          fprintf(stderr, "%s %s (%s): ", prompt, cryptsource,
 
205
                  crypttarget);
 
206
        }
 
207
      }
 
208
    }
191
209
    ret = getline(&buffer, &n, stdin);
192
210
    if (ret > 0){
193
211
      fprintf(stdout, "%s", buffer);